From f69232362e951d601182264a18741c5979b22c9e Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Mon, 27 Mar 2006 01:14:59 -0800
Subject: [PATCH] --- yaml --- r: 24261 b: refs/heads/master c:
 3e7b19198003fc25b11838e709f17d4fa173b2d7 h: refs/heads/master i:   24259:
 2cd465bd294581507fd32d032ee26792c83ba8a7 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/autofs4/autofs_i.h | 2 +-
 trunk/fs/autofs4/waitq.c    | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ce3c0feea3be..2fbddb4a3d6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 871f94344cea36b2ce91231f442f9f9298529712
+refs/heads/master: 3e7b19198003fc25b11838e709f17d4fa173b2d7
diff --git a/trunk/fs/autofs4/autofs_i.h b/trunk/fs/autofs4/autofs_i.h
index ff6239d57b4b..617fd7b37447 100644
--- a/trunk/fs/autofs4/autofs_i.h
+++ b/trunk/fs/autofs4/autofs_i.h
@@ -85,7 +85,7 @@ struct autofs_wait_queue {
 	pid_t tgid;
 	/* This is for status reporting upon return */
 	int status;
-	atomic_t notified;
+	atomic_t notify;
 	atomic_t wait_ctr;
 };
 
diff --git a/trunk/fs/autofs4/waitq.c b/trunk/fs/autofs4/waitq.c
index 894d74671bd0..142ab6aa2aa1 100644
--- a/trunk/fs/autofs4/waitq.c
+++ b/trunk/fs/autofs4/waitq.c
@@ -263,7 +263,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
 		wq->tgid = current->tgid;
 		wq->status = -EINTR; /* Status return if interrupted */
 		atomic_set(&wq->wait_ctr, 2);
-		atomic_set(&wq->notified, 1);
+		atomic_set(&wq->notify, 1);
 		mutex_unlock(&sbi->wq_mutex);
 	} else {
 		atomic_inc(&wq->wait_ctr);
@@ -273,9 +273,11 @@ 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)) {
+	if (notify != NFY_NONE && atomic_read(&wq->notify)) {
 		int type;
 
+		atomic_dec(&wq->notify);
+
 		if (sbi->version < 5) {
 			if (notify == NFY_MOUNT)
 				type = autofs_ptype_missing;