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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/afs/dir.c

between commit:

  6dd80936618c ("afs: Use netfslib for directories")

from the vfs-brauner tree and commit:

  8281b27ee7ec ("afs_d_revalidate(): use stable name and parent inode passed by caller")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/afs/dir.c
index a843c36fc471,c6ee6257d4c6..000000000000
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@@ -597,8 -607,8 +598,8 @@@ static bool afs_lookup_one_filldir(stru
   * Do a lookup of a single name in a directory
   * - just returns the FID the dentry name maps to if found
   */
- static int afs_do_lookup_one(struct inode *dir, struct dentry *dentry,
+ static int afs_do_lookup_one(struct inode *dir, const struct qstr *name,
 -			     struct afs_fid *fid, struct key *key,
 +			     struct afs_fid *fid,
  			     afs_dataversion_t *_dir_version)
  {
  	struct afs_super_info *as = dir->i_sb->s_fs_info;
@@@ -609,10 -619,10 +610,10 @@@
  	};
  	int ret;
  
- 	_enter("{%lu},%p{%pd},", dir->i_ino, dentry, dentry);
+ 	_enter("{%lu},{%s},", dir->i_ino, name->name);
  
  	/* search the directory */
 -	ret = afs_dir_iterate(dir, &cookie.ctx, key, _dir_version);
 +	ret = afs_dir_iterate(dir, &cookie.ctx, NULL, _dir_version);
  	if (ret < 0) {
  		_leave(" = %d [iter]", ret);
  		return ret;
@@@ -1127,7 -1142,7 +1114,7 @@@ static int afs_d_revalidate(struct inod
  	afs_stat_v(dir, n_reval);
  
  	/* search the directory for this vnode */
- 	ret = afs_do_lookup_one(&dir->netfs.inode, dentry, &fid, &dir_version);
 -	ret = afs_do_lookup_one(&dir->netfs.inode, name, &fid, key, &dir_version);
++	ret = afs_do_lookup_one(&dir->netfs.inode, name, &fid, &dir_version);
  	switch (ret) {
  	case 0:
  		/* the filename maps to something */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]