2 files changed, 6 insertions, 7 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 014e7aba3b08..e6f84d26f4cf 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -36,7 +36,7 @@ static long autofs4_root_compat_ioctl(struct file *,unsigned int,unsigned long);
 static int autofs4_dir_open(struct inode *inode, struct file *file);
 static struct dentry *autofs4_lookup(struct inode *,struct dentry *, struct nameidata *);
 static struct vfsmount *autofs4_d_automount(struct path *);
-static int autofs4_d_manage(struct dentry *, bool, bool);
+static int autofs4_d_manage(struct dentry *, bool);
 static void autofs4_dentry_release(struct dentry *);
 
 const struct file_operations autofs4_root_operations = {
@@ -446,7 +446,7 @@ done:
         return NULL;
 }
 
-int autofs4_d_manage(struct dentry *dentry, bool mounting_here, bool rcu_walk)
+int autofs4_d_manage(struct dentry *dentry, bool rcu_walk)
 {
         struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
 
@@ -454,7 +454,7 @@ int autofs4_d_manage(struct dentry *dentry, bool mounting_here, bool rcu_walk)
                 dentry, dentry->d_name.len, dentry->d_name.name);
 
         /* The daemon never waits. */
-        if (autofs4_oz_mode(sbi) || mounting_here) {
+        if (autofs4_oz_mode(sbi)) {
                 if (!d_mountpoint(dentry))
                         return -EISDIR;
                 return 0;
diff --git a/fs/namei.c b/fs/namei.c
index e092648a068c..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)
@@ -1086,7 +1085,7 @@ int follow_down(struct path *path)
                         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);
+                                path->dentry, false);
                         if (ret < 0)
                                 return ret == -EISDIR ? 0 : ret;
                 }