From 186261f89377ac2ea5ea92fbff82fe8be9e0a526 Mon Sep 17 00:00:00 2001
From: Yanchuan Nian <ycnian@gmail.com>
Date: Mon, 24 Dec 2012 18:11:45 +0800
Subject: [PATCH] --- yaml --- r: 359702 b: refs/heads/master c:
 266533c6df7a4a4e2ebd0bfdd272f7eb7cf4b81f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ade4c082c3e8..a4f1ac7b6745 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74b70dded311fa0e6e7529514b29bbb8e6bb1f3e
+refs/heads/master: 266533c6df7a4a4e2ebd0bfdd272f7eb7cf4b81f
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 29924a04cf3d..cc41bf4bcab2 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1844,11 +1844,12 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 
 	/* cache solo and embedded create sessions under the state lock */
 	nfsd4_cache_create_session(cr_ses, cs_slot, status);
-out:
 	nfs4_unlock_state();
+out:
 	dprintk("%s returns %d\n", __func__, ntohl(status));
 	return status;
 out_free_conn:
+	nfs4_unlock_state();
 	free_conn(conn);
 out_free_session:
 	__free_session(new);