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

Message ID 20170126201452.6760.70964.stgit@manet.1015granger.net
State New
Headers show

Commit Message

Chuck Lever Jan. 26, 2017, 8:14 p.m. UTC
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+
---
 fs/nfs/nfs4state.c |    1 +
 1 file changed, 1 insertion(+)


--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Trond Myklebust Jan. 26, 2017, 8:26 p.m. UTC | #1
On Thu, 2017-01-26 at 15:14 -0500, Chuck Lever wrote:
> 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+

> ---

>  fs/nfs/nfs4state.c |    1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c

> index 90e6193..daeb94e 100644

> --- a/fs/nfs/nfs4state.c

> +++ b/fs/nfs/nfs4state.c

> @@ -1091,6 +1091,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;

>  	};

> 


Thanks! Applied...

-- 
Trond Myklebust
Linux NFS client maintainer, PrimaryData
trond.myklebust@primarydata.com

Patch
diff mbox

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 90e6193..daeb94e 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1091,6 +1091,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;
 	};