summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-06-22 14:10:14 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-22 17:19:28 -0400
commit76407f76e0f71428f3c31faff004bff87fea51ba (patch)
treee8bbc8e7e542980633a05b49a13242bdb9e7651c /fs/nfsd
parent68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7 (diff)
downloadlinux-3.10-76407f76e0f71428f3c31faff004bff87fea51ba.tar.gz
linux-3.10-76407f76e0f71428f3c31faff004bff87fea51ba.tar.bz2
linux-3.10-76407f76e0f71428f3c31faff004bff87fea51ba.zip
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/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c1
-rw-r--r--fs/nfsd/nfs4xdr.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 117670864af..5a69ee69b44 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -714,7 +714,6 @@ release_session_client(struct nfsd4_session *session)
} else
renew_client_locked(clp);
spin_unlock(&client_lock);
- nfsd4_put_session(session);
}
/* must be called under the client_lock */
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index ac17a708023..835924f5ca5 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
}
/* Renew the clientid on success and on replay */
release_session_client(cs->session);
+ nfsd4_put_session(cs->session);
}
return 1;
}