aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-04-18 14:43:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 13:25:36 -0700
commitd6a18aea9577844da0cdc0a595cbedde46b512d8 (patch)
tree3298fc6d2ca1a13848200d67fe1e9598f179e377
parented6ad7a5caac4bc865280a2946b54f348a3bb2f4 (diff)
downloadlinux-linaro-stable-d6a18aea9577844da0cdc0a595cbedde46b512d8.tar.gz
NFSd: call rpc_destroy_wait_queue() from free_client()
commit 4cb57e3032d4e4bf5e97780e9907da7282b02b0c upstream. Mainly to ensure that we don't leave any hanging timers. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfsd/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f4b23d0a11f9..24b7b36e6ea3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1110,6 +1110,7 @@ free_client(struct nfs4_client *clp)
WARN_ON_ONCE(atomic_read(&ses->se_ref));
free_session(ses);
}
+ rpc_destroy_wait_queue(&clp->cl_cb_waitq);
free_svc_cred(&clp->cl_cred);
kfree(clp->cl_name.data);
idr_destroy(&clp->cl_stateids);