aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 70587f383f10..a6f625497612 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -410,9 +410,6 @@ static int nfs_create_rpc_client(struct nfs_client *clp, int proto,
410 */ 410 */
411static void nfs_destroy_server(struct nfs_server *server) 411static void nfs_destroy_server(struct nfs_server *server)
412{ 412{
413 if (!IS_ERR(server->client_acl))
414 rpc_shutdown_client(server->client_acl);
415
416 if (!(server->flags & NFS_MOUNT_NONLM)) 413 if (!(server->flags & NFS_MOUNT_NONLM))
417 lockd_down(); /* release rpc.lockd */ 414 lockd_down(); /* release rpc.lockd */
418} 415}
@@ -755,6 +752,9 @@ void nfs_free_server(struct nfs_server *server)
755 752
756 if (server->destroy != NULL) 753 if (server->destroy != NULL)
757 server->destroy(server); 754 server->destroy(server);
755
756 if (!IS_ERR(server->client_acl))
757 rpc_shutdown_client(server->client_acl);
758 if (!IS_ERR(server->client)) 758 if (!IS_ERR(server->client))
759 rpc_shutdown_client(server->client); 759 rpc_shutdown_client(server->client);
760 760