linux-next: manual merge of the workqueues tree with the cifs tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/