From af27bccce2236eb8ce1387abfa90541d7a6a293c Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 11 Dec 2007 22:01:56 -0500 Subject: [PATCH] --- yaml --- r: 74959 b: refs/heads/master c: 5cef338b30c110daf547fb13d99f0c77f2a79fbc h: refs/heads/master i: 74957: 9df7b8acda117041cec158aebb3a119361108ac7 74955: 8c86cb3eda8d0fb283924b38c974110600d9a721 74951: 2b838ee722374627beef64bbbd02c8bf234c6515 74943: cc940c6672b38121df407143c4111486ffa83a58 v: v3 --- [refs] | 2 +- trunk/fs/nfs/client.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 24a516b1d04e..77d0754a3acd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4584f520e1f773082ef44ff4f8969a5d992b16ec +refs/heads/master: 5cef338b30c110daf547fb13d99f0c77f2a79fbc diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c index 70587f383f10..a6f625497612 100644 --- a/trunk/fs/nfs/client.c +++ b/trunk/fs/nfs/client.c @@ -410,9 +410,6 @@ static int nfs_create_rpc_client(struct nfs_client *clp, int proto, */ static void nfs_destroy_server(struct nfs_server *server) { - if (!IS_ERR(server->client_acl)) - rpc_shutdown_client(server->client_acl); - if (!(server->flags & NFS_MOUNT_NONLM)) lockd_down(); /* release rpc.lockd */ } @@ -755,6 +752,9 @@ void nfs_free_server(struct nfs_server *server) if (server->destroy != NULL) server->destroy(server); + + if (!IS_ERR(server->client_acl)) + rpc_shutdown_client(server->client_acl); if (!IS_ERR(server->client)) rpc_shutdown_client(server->client);