Merge remote-tracking branch 'userns/for-next'

Conflicts:
	fs/fuse/dir.c

diff --cc fs/afs/dir.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/fuse/dir.c
index 0747f6eed59836954a23743cddde06fef4d8c05c,b1cd7b79a325dfdb22df0cfd3a3fe0fba9386171..3959aa981f17a3a23da34d3cc23645b57b22b321
--- 1/fs/fuse/dir.c
--- 2/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -263,9 -259,7 +263,10 @@@ out
  
  invalid:
        ret = 0;
 -      shrink_submounts_and_drop(entry);
 +
-       if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
-               ret = 1;
++      if (!(flags & LOOKUP_RCU))
++              shrink_submounts_and_drop(entry);
++
        goto out;
  }
  

diff --cc fs/namei.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/nfs/dir.c
index 76548d81f926c8843a291350a080f09938c0d0fd,e8e35acd88500949857e10a495db27820445326f..c20fffac621e0f4032ae066c4cc884f800b5f684
--- 1/fs/nfs/dir.c
--- 2/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@@ -1128,13 -1142,11 +1128,10 @@@ out_zap_parent
                if (dentry->d_flags & DCACHE_DISCONNECTED)
                        goto out_valid;
        }
-       /* If we have submounts, don't unhash ! */
-       if (check_submounts_and_drop(dentry) != 0)
-               goto out_valid;
- 
+       shrink_submounts_and_drop(dentry);
        dput(parent);
 -      dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n",
 -                      __func__, dentry->d_parent->d_name.name,
 -                      dentry->d_name.name);
 +      dfprintk(LOOKUPCACHE, "NFS: %s(%pd2) is invalid\n",
 +                      __func__, dentry);
        return 0;
  out_error:
        nfs_free_fattr(fattr);

diff --cc fs/sysfs/dir.c
index eab59de47556568e522c66e83bd0844de4cd5146,477c66d4e2a85a4a81962993feda816ee1e2a76f..11837b73abbfac18fdc733b41808dac2800d6af9
--- 1/fs/sysfs/dir.c
--- 2/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@@ -311,11 -318,15 +311,10 @@@ static int sysfs_dentry_revalidate(stru
                goto out_bad;
  
        /* The sysfs dirent has been moved to a different namespace */
 -      type = KOBJ_NS_TYPE_NONE;
 -      if (sd->s_parent) {
 -              type = sysfs_ns_type(sd->s_parent);
 -              if (type != KOBJ_NS_TYPE_NONE &&
 -                              sysfs_info(dentry->d_sb)->ns[type] != sd->s_ns)
 -                      goto out_bad;
 -      }
 +      if (sd->s_ns && sd->s_ns != sysfs_info(dentry->d_sb)->ns)
 +              goto out_bad;
  
        mutex_unlock(&sysfs_mutex);
- out_valid:
        return 1;
  out_bad:
        /* Remove the dentry from the dcache hashes.

diff --cc include/linux/dcache.h
Simple merge