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);
 }