* linux-next: manual merge of the workqueues tree with the cifs tree
@ 2010-07-23 4:46 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2010-07-23 4:46 UTC (permalink / raw)
To: Tejun Heo
Cc: linux-next, linux-kernel, Suresh Jayaraman, Steve French,
linux-cifs
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
fs/cifs/cifsglob.h between commit
1626bccfc79b354aa47cbfc5c8d39f7be8823eb4 ("cifs: guard cifsglob.h against
multiple inclusion") from the cifs tree and commit
9b646972467fb5fdc677f9e4251875db20bdbb64 ("cifs: use workqueue instead of
slow-work") from the workqueues tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/cifs/cifsglob.h
index 9b7cf9a,f5a1f9b..0000000
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@@ -727,6 -732,6 +727,8 @@@ GLOBAL_EXTERN unsigned int cifs_min_rcv
GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */
GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/
- extern const struct slow_work_ops cifs_oplock_break_ops;
+ void cifs_oplock_break(struct work_struct *work);
+ void cifs_oplock_break_get(struct cifsFileInfo *cfile);
+ void cifs_oplock_break_put(struct cifsFileInfo *cfile);
+
+#endif /* _CIFS_GLOB_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the workqueues tree with the cifs tree
@ 2010-07-23 4:46 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2010-07-23 4:46 UTC (permalink / raw)
To: Tejun Heo
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Suresh Jayaraman,
Steve French, linux-cifs-u79uwXL29TY76Z2rM5mHXA
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
fs/cifs/file.c between commit 7d4716ba25ecc032d83ec4fa231edfcef8e17b62
("cifs: FS-Cache page management") from the cifs tree and commit
9b646972467fb5fdc677f9e4251875db20bdbb64 ("cifs: use workqueue instead of
slow-work") from the workqueues tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org
diff --cc fs/cifs/file.c
index fa04a00d,e767bfa..0000000
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@@ -2291,24 -2295,7 +2291,23 @@@ out
return rc;
}
+static int cifs_release_page(struct page *page, gfp_t gfp)
+{
+ if (PagePrivate(page))
+ return 0;
+
+ return cifs_fscache_release_page(page, gfp);
+}
+
+static void cifs_invalidate_page(struct page *page, unsigned long offset)
+{
+ struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host);
+
+ if (offset == 0)
+ cifs_fscache_invalidate_page(page, &cifsi->vfs_inode);
+}
+
- static void
- cifs_oplock_break(struct slow_work *work)
+ void cifs_oplock_break(struct work_struct *work)
{
struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo,
oplock_break);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-23 4:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-23 4:46 linux-next: manual merge of the workqueues tree with the cifs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-07-23 4:46 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox