1 files changed, 7 insertions, 0 deletions

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 5a40d36e5a51..fa2348dcd671 100644
--- 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 ) {