1 files changed, 7 insertions, 1 deletions

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index e1fbdeef85db..c13273afd546 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -257,6 +257,9 @@ static int validate_request(struct autofs_wait_queue **wait,
         struct autofs_wait_queue *wq;
         struct autofs_info *ino;
 
+        if (sbi->catatonic)
+                return -ENOENT;
+
         /* Wait in progress, continue; */
         wq = autofs4_find_wait(sbi, qstr);
         if (wq) {
@@ -289,6 +292,9 @@ static int validate_request(struct autofs_wait_queue **wait,
                         if (mutex_lock_interruptible(&sbi->wq_mutex))
                                 return -EINTR;
 
+                        if (sbi->catatonic)
+                                return -ENOENT;
+
                         wq = autofs4_find_wait(sbi, qstr);
                         if (wq) {
                                 *wait = wq;
@@ -389,7 +395,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
 
         ret = validate_request(&wq, sbi, &qstr, dentry, notify);
         if (ret <= 0) {
-                if (ret == 0)
+                if (ret != -EINTR)
                         mutex_unlock(&sbi->wq_mutex);
                 kfree(qstr.name);
                 return ret;