From b2dd005dfcd85831de5ea46ce85110a59665fdd8 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Mon, 13 Feb 2012 16:13:41 -0500
Subject: [PATCH] --- yaml --- r: 297425 b: refs/heads/master c:
 f6d82485e9a947ae19bb29e72644f4c6f27d5b89 h: refs/heads/master i:   297423:
 f74958d0de958941e93d1284b7d86d3bf2755410 v: v3

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

diff --git a/[refs] b/[refs]
index 52e66db37e8d..07a9a9a990a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 508f92275624fc755104b17945bdc822936f1918
+refs/heads/master: f6d82485e9a947ae19bb29e72644f4c6f27d5b89
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index e8c98f009670..2095dbb2923e 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1575,16 +1575,11 @@ check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse)
 		else
 			return nfserr_seq_misordered;
 	}
-	/* Normal */
+	/* Note unsigned 32-bit arithmetic handles wraparound: */
 	if (likely(seqid == slot_seqid + 1))
 		return nfs_ok;
-	/* Replay */
 	if (seqid == slot_seqid)
 		return nfserr_replay_cache;
-	/* Wraparound */
-	if (seqid == 1 && (slot_seqid + 1) == 0)
-		return nfs_ok;
-	/* Misordered replay or misordered new request */
 	return nfserr_seq_misordered;
 }