diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-22 14:10:14 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-22 17:19:28 -0400 |
commit | 76407f76e0f71428f3c31faff004bff87fea51ba (patch) | |
tree | e8bbc8e7e542980633a05b49a13242bdb9e7651c /fs | |
parent | 68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7 (diff) |
nfsd4; fix session reference count leak
Note the session has to be put() here regardless of what happens to the
client.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfs4state.c | 1 | ||||
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 117670864af0..5a69ee69b44f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -714,7 +714,6 @@ release_session_client(struct nfsd4_session *session) | |||
714 | } else | 714 | } else |
715 | renew_client_locked(clp); | 715 | renew_client_locked(clp); |
716 | spin_unlock(&client_lock); | 716 | spin_unlock(&client_lock); |
717 | nfsd4_put_session(session); | ||
718 | } | 717 | } |
719 | 718 | ||
720 | /* must be called under the client_lock */ | 719 | /* must be called under the client_lock */ |
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index ac17a7080239..835924f5ca54 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -3325,6 +3325,7 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo | |||
3325 | } | 3325 | } |
3326 | /* Renew the clientid on success and on replay */ | 3326 | /* Renew the clientid on success and on replay */ |
3327 | release_session_client(cs->session); | 3327 | release_session_client(cs->session); |
3328 | nfsd4_put_session(cs->session); | ||
3328 | } | 3329 | } |
3329 | return 1; | 3330 | return 1; |
3330 | } | 3331 | } |