From be56a771c8c1b045a50c623589a0a1e4b5f5ddd6 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Sat, 2 Oct 2010 17:03:35 -0400
Subject: [PATCH] --- yaml --- r: 217284 b: refs/heads/master c:
 cd5b814458e5554457c6e62f17aed122145b065e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6ff01f3f0e1f..8da8b64c01e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9247685088398cf21bcb513bd2832b4cd42516c4
+refs/heads/master: cd5b814458e5554457c6e62f17aed122145b065e
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 02c23b7c5cd5..7f1282859cd6 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1510,7 +1510,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 		if (status) {
 			/* an unconfirmed replay returns misordered */
 			status = nfserr_seq_misordered;
-			goto out_cache;
+			goto out;
 		}
 
 		cs_slot->sl_seqid++; /* from 0 to 1 */
@@ -1549,7 +1549,6 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 	       NFS4_MAX_SESSIONID_LEN);
 	cr_ses->seqid = cs_slot->sl_seqid;
 
-out_cache:
 	/* cache solo and embedded create sessions under the state lock */
 	nfsd4_cache_create_session(cr_ses, cs_slot, status);
 out: