aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-04-18 14:43:57 -0400
committerBen Hutchings <ben@decadent.org.uk>2014-06-09 13:29:09 +0100
commita1c2ce496cc680efb0086b65b303bdb6919f2aea (patch)
tree126f9ab74dcd5cc7620e8159d458f70d1fc21141 /fs/nfsd
parent9f8b7c3919e494881697db355b8b8b33400d740e (diff)
downloadkernel_samsung_smdk4412-a1c2ce496cc680efb0086b65b303bdb6919f2aea.zip
kernel_samsung_smdk4412-a1c2ce496cc680efb0086b65b303bdb6919f2aea.tar.gz
kernel_samsung_smdk4412-a1c2ce496cc680efb0086b65b303bdb6919f2aea.tar.bz2
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> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfsd')
-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 10eeccc..71ff73d 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1011,6 +1011,7 @@ free_client(struct nfs4_client *clp)
list_del(&ses->se_perclnt);
nfsd4_put_session(ses);
}
+ rpc_destroy_wait_queue(&clp->cl_cb_waitq);
if (clp->cl_cred.cr_group_info)
put_group_info(clp->cl_cred.cr_group_info);
kfree(clp->cl_principal);