From 482b1471724677178071480af3ae347e8e94d6a2 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 5 Feb 2010 15:09:22 -0500
Subject: [PATCH] --- yaml --- r: 186362 b: refs/heads/master c:
 7e469af97eed947ba9204712601281a69ae8eb6c h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/lockd/mon.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6b3d0b802b0b..def46be9110f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdd30fa1664e0245fa64330c7cc2ddab7e47c223
+refs/heads/master: 7e469af97eed947ba9204712601281a69ae8eb6c
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index f956651d0f65..fefa4df3f005 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -349,9 +349,9 @@ struct nsm_handle *nsm_get_handle(const struct sockaddr *sap,
  * nsm_reboot_lookup - match NLMPROC_SM_NOTIFY arguments to an nsm_handle
  * @info: pointer to NLMPROC_SM_NOTIFY arguments
  *
- * Returns a matching nsm_handle if found in the nsm cache; the returned
- * nsm_handle's reference count is bumped and sm_monitored is cleared.
- * Otherwise returns NULL if some error occurred.
+ * Returns a matching nsm_handle if found in the nsm cache. The returned
+ * nsm_handle's reference count is bumped. Otherwise returns NULL if some
+ * error occurred.
  */
 struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info)
 {
@@ -370,12 +370,6 @@ struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info)
 	atomic_inc(&cached->sm_count);
 	spin_unlock(&nsm_lock);
 
-	/*
-	 * During subsequent lock activity, force a fresh
-	 * notification to be set up for this host.
-	 */
-	cached->sm_monitored = 0;
-
 	dprintk("lockd: host %s (%s) rebooted, cnt %d\n",
 			cached->sm_name, cached->sm_addrbuf,
 			atomic_read(&cached->sm_count));