From 96d86919d603e36a8f7bf55dd1e6dce232807620 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Tue, 22 Jun 2010 14:10:14 -0400
Subject: [PATCH] --- yaml --- r: 206426 b: refs/heads/master c:
 76407f76e0f71428f3c31faff004bff87fea51ba h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfsd/nfs4state.c | 1 -
 trunk/fs/nfsd/nfs4xdr.c   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b54468c3eeec..dbcdd199ab8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a4b48ce6cb73a9643bae6dd3e0f062e3fd8ef7
+refs/heads/master: 76407f76e0f71428f3c31faff004bff87fea51ba
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 117670864af0..5a69ee69b44f 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/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/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index ac17a7080239..835924f5ca54 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/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;
 }