From ed82f9b81409bf2b7b72cd89950ef213846fbdd1 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sun, 21 Feb 2010 17:41:19 -0800 Subject: [PATCH] --- yaml --- r: 192357 b: refs/heads/master c: 147efd0dd702ce2f1ab44449bd70369405ef68fd h: refs/heads/master i: 192355: 17af6a49f2f06def07216cca58d4219dd8d82dd7 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 26134a1cc553..a34657690326 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 227f98d98d2ed7929f41426adc21f57b927354a6 +refs/heads/master: 147efd0dd702ce2f1ab44449bd70369405ef68fd diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index efef7f2442d5..9ce58318ca8c 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -697,9 +697,6 @@ shutdown_callback_client(struct nfs4_client *clp) static inline void free_client(struct nfs4_client *clp) { - shutdown_callback_client(clp); - if (clp->cl_cb_xprt) - svc_xprt_put(clp->cl_cb_xprt); if (clp->cl_cred.cr_group_info) put_group_info(clp->cl_cred.cr_group_info); kfree(clp->cl_principal); @@ -752,6 +749,9 @@ expire_client(struct nfs4_client *clp) se_perclnt); release_session(ses); } + shutdown_callback_client(clp); + if (clp->cl_cb_xprt) + svc_xprt_put(clp->cl_cb_xprt); put_nfs4_client(clp); }