1 files changed, 10 insertions, 6 deletions

diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 782e57b911ab..1246f396bf0e 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -275,8 +275,11 @@ static int autofs_mount_wait(const struct path *path, bool rcu_walk)
                 pr_debug("waiting for mount name=%pd\n", path->dentry);
                 status = autofs_wait(sbi, path, NFY_MOUNT);
                 pr_debug("mount wait done status=%d\n", status);
+                ino->last_used = jiffies;
+                return status;
         }
-        ino->last_used = jiffies;
+        if (!(sbi->flags & AUTOFS_SBI_STRICTEXPIRE))
+                ino->last_used = jiffies;
         return status;
 }
 
@@ -510,7 +513,8 @@ static struct dentry *autofs_lookup(struct inode *dir,
         sbi = autofs_sbi(dir->i_sb);
 
         pr_debug("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n",
-                 current->pid, task_pgrp_nr(current), sbi->catatonic,
+                 current->pid, task_pgrp_nr(current),
+                 sbi->flags & AUTOFS_SBI_CATATONIC,
                  autofs_oz_mode(sbi));
 
         active = autofs_lookup_active(dentry);
@@ -563,7 +567,7 @@ static int autofs_dir_symlink(struct inode *dir,
          * autofs mount is catatonic but the state of an autofs
          * file system needs to be preserved over restarts.
          */
-        if (sbi->catatonic)
+        if (sbi->flags & AUTOFS_SBI_CATATONIC)
                 return -EACCES;
 
         BUG_ON(!ino);
@@ -626,7 +630,7 @@ static int autofs_dir_unlink(struct inode *dir, struct dentry *dentry)
          * autofs mount is catatonic but the state of an autofs
          * file system needs to be preserved over restarts.
          */
-        if (sbi->catatonic)
+        if (sbi->flags & AUTOFS_SBI_CATATONIC)
                 return -EACCES;
 
         if (atomic_dec_and_test(&ino->count)) {
@@ -714,7 +718,7 @@ static int autofs_dir_rmdir(struct inode *dir, struct dentry *dentry)
          * autofs mount is catatonic but the state of an autofs
          * file system needs to be preserved over restarts.
          */
-        if (sbi->catatonic)
+        if (sbi->flags & AUTOFS_SBI_CATATONIC)
                 return -EACCES;
 
         spin_lock(&sbi->lookup_lock);
@@ -759,7 +763,7 @@ static int autofs_dir_mkdir(struct inode *dir,
          * autofs mount is catatonic but the state of an autofs
          * file system needs to be preserved over restarts.
          */
-        if (sbi->catatonic)
+        if (sbi->flags & AUTOFS_SBI_CATATONIC)
                 return -EACCES;
 
         pr_debug("dentry %p, creating %pd\n", dentry, dentry);