Merge branch 'upstream'

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

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 1ab24a662e09f22743ae1ef44287cf54b0b94224..394ff36ef8f19ec84a4f26a0c1a96e2badb7cb84 100644 (file)
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -191,6 +191,13 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
        }
 
        if ( !wq ) {
+               /* Can't wait for an expire if there's no mount */
+               if (notify == NFY_NONE && !d_mountpoint(dentry)) {
+                       kfree(name);
+                       up(&sbi->wq_sem);
+                       return -ENOENT;
+               }
+
                /* Create a new wait queue */
                wq = kmalloc(sizeof(struct autofs_wait_queue),GFP_KERNEL);
                if ( !wq ) {
@@ -210,17 +217,8 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
                wq->len = len;
                wq->status = -EINTR; /* Status return if interrupted */
                atomic_set(&wq->wait_ctr, 2);
+               atomic_set(&wq->notified, 1);
                up(&sbi->wq_sem);
-
-               DPRINTK("new wait id = 0x%08lx, name = %.*s, nfy=%d",
-                       (unsigned long) wq->wait_queue_token, wq->len, wq->name, notify);
-               /* autofs4_notify_daemon() may block */
-               if (notify != NFY_NONE) {
-                       autofs4_notify_daemon(sbi,wq, 
-                                       notify == NFY_MOUNT ?
-                                                 autofs_ptype_missing :
-                                                 autofs_ptype_expire_multi);
-               }
        } else {
                atomic_inc(&wq->wait_ctr);
                up(&sbi->wq_sem);
@@ -229,15 +227,24 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
                        (unsigned long) wq->wait_queue_token, wq->len, wq->name, notify);
        }
 
+       if (notify != NFY_NONE && atomic_dec_and_test(&wq->notified)) {
+               int type = (notify == NFY_MOUNT ?
+                       autofs_ptype_missing : autofs_ptype_expire_multi);
+
+               DPRINTK("new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
+                       (unsigned long) wq->wait_queue_token, wq->len, wq->name, notify);
+
+               /* autofs4_notify_daemon() may block */
+               autofs4_notify_daemon(sbi, wq, type);
+       }
+
        /* wq->name is NULL if and only if the lock is already released */
 
        if ( sbi->catatonic ) {
                /* We might have slept, so check again for catatonic mode */
                wq->status = -ENOENT;
-               if ( wq->name ) {
-                       kfree(wq->name);
-                       wq->name = NULL;
-               }
+               kfree(wq->name);
+               wq->name = NULL;
        }
 
        if ( wq->name ) {