1 files changed, 10 insertions, 1 deletions

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 514f5f20701e..c5f9113cdc70 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -324,7 +324,16 @@ nlmsvc_same_host(struct nlm_host *host, struct nlm_host *other)
 static int
 nlmsvc_is_client(struct nlm_host *host, struct nlm_host *dummy)
 {
-        return host->h_server;
+        if (host->h_server) {
+                /* we are destroying locks even though the client
+                 * hasn't asked us too, so don't unmonitor the
+                 * client
+                 */
+                if (host->h_nsmhandle)
+                        host->h_nsmhandle->sm_sticky = 1;
+                return 1;
+        } else
+                return 0;
 }
 
 /*