1 files changed, 5 insertions, 6 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 651e4ef563b..20225636a4e 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -234,7 +234,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
                 nd->flags);
         /*
          * For an expire of a covered direct or offset mount we need
-         * to break out of follow_down() at the autofs mount trigger
+         * to break out of follow_down_one() at the autofs mount trigger
          * (d_mounted--), so we can see the expiring flag, and manage
          * the blocking and following here until the expire is completed.
          */
@@ -243,7 +243,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
                 if (ino->flags & AUTOFS_INF_EXPIRING) {
                         spin_unlock(&sbi->fs_lock);
                         /* Follow down to our covering mount. */
-                        if (!follow_down(&nd->path))
+                        if (!follow_down_one(&nd->path))
                                 goto done;
                         goto follow;
                 }
@@ -292,11 +292,10 @@ follow:
          * multi-mount with no root offset so we don't need
          * to follow it.
          */
-        if (d_mountpoint(dentry)) {
-                if (!autofs4_follow_mount(&nd->path)) {
-                        status = -ENOENT;
+        if (d_managed(dentry)) {
+                status = follow_down(&nd->path, false);
+                if (status < 0)
                         goto out_error;
-                }
         }
 
 done: