1 files changed, 6 insertions, 11 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index d79ced925861..82e8f6edfb48 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -281,8 +281,8 @@ static int autofs4_mount_wait(const struct path *path, bool rcu_walk)
                 pr_debug("waiting for mount name=%pd\n", path->dentry);
                 status = autofs4_wait(sbi, path, NFY_MOUNT);
                 pr_debug("mount wait done status=%d\n", status);
-                ino->last_used = jiffies;
         }
+        ino->last_used = jiffies;
         return status;
 }
 
@@ -321,21 +321,16 @@ static struct dentry *autofs4_mountpoint_changed(struct path *path)
          */
         if (autofs_type_indirect(sbi->type) && d_unhashed(dentry)) {
                 struct dentry *parent = dentry->d_parent;
+                struct autofs_info *ino;
                 struct dentry *new;
 
                 new = d_lookup(parent, &dentry->d_name);
                 if (!new)
                         return NULL;
-                if (new == dentry)
-                        dput(new);
-                else {
-                        struct autofs_info *ino;
-
-                        ino = autofs4_dentry_ino(new);
-                        ino->last_used = jiffies;
-                        dput(path->dentry);
-                        path->dentry = new;
-                }
+                ino = autofs4_dentry_ino(new);
+                ino->last_used = jiffies;
+                dput(path->dentry);
+                path->dentry = new;
         }
         return path->dentry;
 }