Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fs: call security_d_instantiate in d_obtain_alias V2
  lose 'mounting_here' argument in ->d_manage()
  don't pass 'mounting_here' flag to follow_down()
  change the locking order for namespace_sem
  fix deadlock in pivot_root()
  vfs: split off vfsmount-related parts of vfs_kern_mount()
  Some fixes for pstore
  kill simple_set_mnt()

1 files changed, 4 insertions, 5 deletions

diff --git a/fs/namei.c b/fs/namei.c
index b912b7abe747..5a9a6c3094da 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -933,8 +933,7 @@ static int follow_managed(struct path *path, unsigned flags)
                 if (managed & DCACHE_MANAGE_TRANSIT) {
                         BUG_ON(!path->dentry->d_op);
                         BUG_ON(!path->dentry->d_op->d_manage);
-                        ret = path->dentry->d_op->d_manage(path->dentry,
-                                                           false, false);
+                        ret = path->dentry->d_op->d_manage(path->dentry, false);
                         if (ret < 0)
                                 return ret == -EISDIR ? 0 : ret;
                 }
@@ -999,7 +998,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path,
                 struct vfsmount *mounted;
                 if (unlikely(path->dentry->d_flags & DCACHE_MANAGE_TRANSIT) &&
                     !reverse_transit &&
-                    path->dentry->d_op->d_manage(path->dentry, false, true) < 0)
+                    path->dentry->d_op->d_manage(path->dentry, true) < 0)
                         return false;
                 mounted = __lookup_mnt(path->mnt, path->dentry, 1);
                 if (!mounted)
@@ -1065,7 +1064,7 @@ failed:
  * Care must be taken as namespace_sem may be held (indicated by mounting_here
  * being true).
  */
-int follow_down(struct path *path, bool mounting_here)
+int follow_down(struct path *path)
 {
         unsigned managed;
         int ret;
@@ -1086,7 +1085,7 @@ int follow_down(struct path *path, bool mounting_here)
                         BUG_ON(!path->dentry->d_op);
                         BUG_ON(!path->dentry->d_op->d_manage);
                         ret = path->dentry->d_op->d_manage(
-                                path->dentry, mounting_here, false);
+                                path->dentry, false);
                         if (ret < 0)
                                 return ret == -EISDIR ? 0 : ret;
                 }