1 files changed, 15 insertions, 10 deletions

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index d8e6d421c27f..57725d4a8c59 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -310,26 +310,29 @@ struct dentry *autofs4_expire_direct(struct super_block *sb,
         now = jiffies;
         timeout = sbi->exp_timeout;
 
-        spin_lock(&sbi->fs_lock);
-        ino = autofs4_dentry_ino(root);
-        /* No point expiring a pending mount */
-        if (ino->flags & AUTOFS_INF_PENDING)
-                goto out;
         if (!autofs4_direct_busy(mnt, root, timeout, do_now)) {
+                spin_lock(&sbi->fs_lock);
+                ino = autofs4_dentry_ino(root);
+                /* No point expiring a pending mount */
+                if (ino->flags & AUTOFS_INF_PENDING) {
+                        spin_unlock(&sbi->fs_lock);
+                        goto out;
+                }
                 ino->flags |= AUTOFS_INF_WANT_EXPIRE;
                 spin_unlock(&sbi->fs_lock);
                 synchronize_rcu();
-                spin_lock(&sbi->fs_lock);
                 if (!autofs4_direct_busy(mnt, root, timeout, do_now)) {
+                        spin_lock(&sbi->fs_lock);
                         ino->flags |= AUTOFS_INF_EXPIRING;
                         init_completion(&ino->expire_complete);
                         spin_unlock(&sbi->fs_lock);
                         return root;
                 }
+                spin_lock(&sbi->fs_lock);
                 ino->flags &= ~AUTOFS_INF_WANT_EXPIRE;
+                spin_unlock(&sbi->fs_lock);
         }
 out:
-        spin_unlock(&sbi->fs_lock);
         dput(root);
 
         return NULL;
@@ -495,8 +498,9 @@ found:
         return expired;
 }
 
-int autofs4_expire_wait(struct dentry *dentry, int rcu_walk)
+int autofs4_expire_wait(const struct path *path, int rcu_walk)
 {
+        struct dentry *dentry = path->dentry;
         struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
         struct autofs_info *ino = autofs4_dentry_ino(dentry);
         int status;
@@ -525,7 +529,7 @@ retry:
 
                 pr_debug("waiting for expire %p name=%pd\n", dentry, dentry);
 
-                status = autofs4_wait(sbi, dentry, NFY_NONE);
+                status = autofs4_wait(sbi, path, NFY_NONE);
                 wait_for_completion(&ino->expire_complete);
 
                 pr_debug("expire done status=%d\n", status);
@@ -592,11 +596,12 @@ int autofs4_do_expire_multi(struct super_block *sb, struct vfsmount *mnt,
 
         if (dentry) {
                 struct autofs_info *ino = autofs4_dentry_ino(dentry);
+                const struct path path = { .mnt = mnt, .dentry = dentry };
 
                 /* This is synchronous because it makes the daemon a
                  * little easier
                  */
-                ret = autofs4_wait(sbi, dentry, NFY_EXPIRE);
+                ret = autofs4_wait(sbi, &path, NFY_EXPIRE);
 
                 spin_lock(&sbi->fs_lock);
                 /* avoid rapid-fire expire attempts if expiry fails */