autofs4: reorganize expire pending wait function calls

[linux-2.6-omap-h63xx.git] / fs / autofs4 / root.c

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index adbd8559e870c78133f2f5ef5a888d60e6b8f233..ae22bde0bbd7e1d5339f6091e63f0ad004892b34 100644 (file)
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -130,34 +130,6 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags)
        struct autofs_info *ino = autofs4_dentry_ino(dentry);
        int status;
 
-       /* Block on any pending expiry here; invalidate the dentry
-           when expiration is done to trigger mount request with a new
-           dentry */
-       spin_lock(&sbi->fs_lock);
-       if (ino->flags & AUTOFS_INF_EXPIRING) {
-               spin_unlock(&sbi->fs_lock);
-
-               DPRINTK("waiting for expire %p name=%.*s",
-                        dentry, dentry->d_name.len, dentry->d_name.name);
-
-               status = autofs4_wait(sbi, dentry, NFY_NONE);
-               wait_for_completion(&ino->expire_complete);
-
-               DPRINTK("expire done status=%d", status);
-
-               /*
-                * If the directory still exists the mount request must
-                * continue otherwise it can't be followed at the right
-                * time during the walk.
-                */
-               status = d_invalidate(dentry);
-               if (status != -EBUSY)
-                       return -EAGAIN;
-
-               goto cont;
-       }
-       spin_unlock(&sbi->fs_lock);
-cont:
        DPRINTK("dentry=%p %.*s ino=%p",
                 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
 
@@ -241,39 +213,19 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
                        /* Follow down to our covering mount. */
                        if (!follow_down(&nd->path.mnt, &nd->path.dentry))
                                goto done;
-                       /*
-                        * We shouldn't need to do this but we have no way
-                        * of knowing what may have been done so try a follow
-                        * just in case.
-                        */
-                       autofs4_follow_mount(&nd->path.mnt, &nd->path.dentry);
-                       goto done;
+                       goto follow;
                }
                spin_unlock(&sbi->fs_lock);
                goto done;
        }
 
        /* If an expire request is pending everyone must wait. */
-       spin_lock(&sbi->fs_lock);
-       if (ino->flags & AUTOFS_INF_EXPIRING) {
-               spin_unlock(&sbi->fs_lock);
-
-               DPRINTK("waiting for active request %p name=%.*s",
-                       dentry, dentry->d_name.len, dentry->d_name.name);
-
-               status = autofs4_wait(sbi, dentry, NFY_NONE);
-               wait_for_completion(&ino->expire_complete);
-
-               DPRINTK("request done status=%d", status);
+       autofs4_expire_wait(dentry);
 
-               goto cont;
-       }
-       spin_unlock(&sbi->fs_lock);
-cont:
        /* We trigger a mount for almost all flags */
        lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS);
        if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING))
-               goto done;
+               goto follow;
 
        /*
         * If the dentry contains directories then it is an autofs
@@ -337,6 +289,14 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd)
                if (oz_mode)
                        return 1;
 
+               /*
+                * If the directory has gone away due to an expire
+                * we have been called as ->d_revalidate() and so
+                * we need to return false and proceed to ->lookup().
+                */
+               if (autofs4_expire_wait(dentry) == -EAGAIN)
+                       return 0;
+
                /*
                 * A zero status is success otherwise we have a
                 * negative error code.
@@ -345,15 +305,6 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd)
                if (status == 0)
                        return 1;
 
-               /*
-                * A status of EAGAIN here means that the dentry has gone
-                * away while waiting for an expire to complete. If we are
-                * racing with expire lookup will wait for it so this must
-                * be a revalidate and we need to send it to lookup.
-                */
-               if (status == -EAGAIN)
-                       return 0;
-
                return status;
        }
        spin_unlock(&sbi->fs_lock);
@@ -563,19 +514,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
                 * so it must have been successful, so just wait for it.
                 */
                ino = autofs4_dentry_ino(expiring);
-               spin_lock(&sbi->fs_lock);
-               if (ino->flags & AUTOFS_INF_EXPIRING) {
-                       spin_unlock(&sbi->fs_lock);
-                       DPRINTK("wait for incomplete expire %p name=%.*s",
-                               expiring, expiring->d_name.len,
-                               expiring->d_name.name);
-                       autofs4_wait(sbi, expiring, NFY_NONE);
-                       wait_for_completion(&ino->expire_complete);
-                       DPRINTK("request completed");
-                       goto cont;
-               }
-               spin_unlock(&sbi->fs_lock);
-cont:
+               autofs4_expire_wait(expiring);
                spin_lock(&sbi->lookup_lock);
                if (!list_empty(&ino->expiring))
                        list_del_init(&ino->expiring);