---

yaml --- r: 346627 b: refs/heads/master c: f259613 h: refs/heads/master i: 346625: 0a6f583 346623: ba53838 v: v3
git-mirror · Dec 13, 2012 · 2e357fe · 2e357fe
1 parent 5c8bcfc
commit 2e357fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);
 }