linux-next: manual merge of the akpm tree with the vfs tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/cachefiles/rdwr.c between commit e89cdeffe531 ("switch dentry_open()
to struct path, make it grab references itself") from the vfs,  tree and
commit "fs: cachefiles: add support for large files in filesystem
caching" from the akpm tree.

I fixed it up (and rolled in the following build fix - see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/cachefiles/rdwr.c
index c0353df,d136686..0000000
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
@@@ -917,9 -916,10 +917,9 @@@ int cachefiles_write_page(struct fscach
  
  	/* write the page to the backing filesystem and let it store it in its
  	 * own time */
 -	dget(object->backer);
 -	mntget(cache->mnt);
 -	file = dentry_open(object->backer, cache->mnt, O_RDWR,
 -			   (O_RDWR | O_LARGEFILE), cache->cache_cred);
 +	path.mnt = cache->mnt;
 +	path.dentry = object->backer;
- 	file = dentry_open(&path, O_RDWR, cache->cache_cred);
++	file = dentry_open(&path, O_RDWR | O_LARGEFILE, cache->cache_cred);
  	if (IS_ERR(file)) {
  		ret = PTR_ERR(file);
  	} else {

Attachment: pgp00000.pgp
Description: PGP signature