From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 26 Jan 2017 20:14:52 +0000 (-0500)
Subject: nfs: Fix "Don't increment lock sequence ID after NFS4ERR_MOVED"
X-Git-Tag: v4.1.12-92~3^2~80
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5e9c29b8aec468ed17c1df6ea99f9d5aba2ac36e;p=users%2Fjedix%2Flinux-maple.git

nfs: Fix "Don't increment lock sequence ID after NFS4ERR_MOVED"

Lock sequence IDs are bumped in decode_lock by calling
nfs_increment_seqid(). nfs_increment_sequid() does not use the
seqid_mutating_err() function fixed in commit 059aa7348241 ("Don't
increment lock sequence ID after NFS4ERR_MOVED").

Fixes: 059aa7348241 ("Don't increment lock sequence ID after ...")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Xuan Qi <xuan.qi@oracle.com>
Cc: stable@vger.kernel.org # v3.7+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

Orabug: 25416941
(cherry picked from commit 406dab8450ec76eca88a1af2fc15d18a2b36ca49)
Signed-off-by: Todd Vierling <todd.vierling@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 2782cfca2265..ef8a6aea6103 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1073,6 +1073,7 @@ static void nfs_increment_seqid(int status, struct nfs_seqid *seqid)
 		case -NFS4ERR_BADXDR:
 		case -NFS4ERR_RESOURCE:
 		case -NFS4ERR_NOFILEHANDLE:
+		case -NFS4ERR_MOVED:
 			/* Non-seqid mutating errors */
 			return;
 	};