Merge branch 'work.autofs' into for-linus

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 1c8f4386b03f..47781b0d909d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1200,7 +1200,7 @@ static int follow_managed(struct path *path, struct nameidata *nd)
                 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);
+                        ret = path->dentry->d_op->d_manage(path, false);
                         if (ret < 0)
                                 break;
                 }
@@ -1263,10 +1263,10 @@ int follow_down_one(struct path *path)
 }
 EXPORT_SYMBOL(follow_down_one);
 
-static inline int managed_dentry_rcu(struct dentry *dentry)
+static inline int managed_dentry_rcu(const struct path *path)
 {
-        return (dentry->d_flags & DCACHE_MANAGE_TRANSIT) ?
-                dentry->d_op->d_manage(dentry, true) : 0;
+        return (path->dentry->d_flags & DCACHE_MANAGE_TRANSIT) ?
+                path->dentry->d_op->d_manage(path, true) : 0;
 }
 
 /*
@@ -1282,7 +1282,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path,
                  * Don't forget we might have a non-mountpoint managed dentry
                  * that wants to block transit.
                  */
-                switch (managed_dentry_rcu(path->dentry)) {
+                switch (managed_dentry_rcu(path)) {
                 case -ECHILD:
                 default:
                         return false;
@@ -1392,8 +1392,7 @@ int follow_down(struct path *path)
                 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);
+                        ret = path->dentry->d_op->d_manage(path, false);
                         if (ret < 0)
                                 return ret == -EISDIR ? 0 : ret;
                 }