From 2e357fe416bad3fbe904d4a97481ff226308089e Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 13 Dec 2012 15:14:36 +1100
Subject: [PATCH] --- yaml --- r: 346627 b: refs/heads/master c:
 f259613a1e4b44a0cf85a5dafd931be96ee7c9e5 h: refs/heads/master i:   346625:
 0a6f583bfdb84a0fd0403dfa0415f83ec2299603   346623:
 ba5383829df44978c396d8c5300c2f8dc931e463 v: v3

---
 [refs]                | 2 +-
 trunk/fs/nfs/client.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b6e3867382a4..35d74b9dd8d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb96d5c97b0825d542e9c4ba5e0a22b519355166
+refs/heads/master: f259613a1e4b44a0cf85a5dafd931be96ee7c9e5
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index c285e0a117e4..9f3c66438d0e 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -615,8 +615,7 @@ EXPORT_SYMBOL_GPL(nfs_create_rpc_client);
  */
 static void nfs_destroy_server(struct nfs_server *server)
 {
-	if (!(server->flags & NFS_MOUNT_LOCAL_FLOCK) ||
-			!(server->flags & NFS_MOUNT_LOCAL_FCNTL))
+	if (server->nlm_host)
 		nlmclnt_done(server->nlm_host);
 }