NFSd: call rpc_destroy_wait_queue() from free_client()

trondmypd · J. Bruce Fields · commit 4cb57e3032d4 · 2014-05-06T12:38:49.000-04:00
Mainly to ensure that we don't leave any hanging timers.

Signed-off-by: Trond Myklebust &lt;trond.myklebust@primarydata.com&gt;
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields &lt;bfields@redhat.com&gt;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
@@ -1107,6 +1107,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);

Original file line number	Diff line number	Diff line change
`@@ -1107,6 +1107,7 @@ free_client(struct nfs4_client *clp)`
`1107`	`1107`	`WARN_ON_ONCE(atomic_read(&ses->se_ref));`
`1108`	`1108`	`free_session(ses);`
`1109`	`1109`	`}`
	`1110`	`+ rpc_destroy_wait_queue(&clp->cl_cb_waitq);`
`1110`	`1111`	`free_svc_cred(&clp->cl_cred);`
`1111`	`1112`	`kfree(clp->cl_name.data);`
`1112`	`1113`	`idr_destroy(&clp->cl_stateids);`