diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2017-01-26 15:14:52 -0500 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:27:06 +0000 |
commit | 36e0a7371ef0054358d0dc1a7902aa0641fe40e5 (patch) | |
tree | db2e3050e482e9625801fc3285b7083b10bf595b /fs | |
parent | 328dca1a45bfcbc5ca4792d68330d97a4f7d47b7 (diff) | |
download | linux-stable-36e0a7371ef0054358d0dc1a7902aa0641fe40e5.tar.gz linux-stable-36e0a7371ef0054358d0dc1a7902aa0641fe40e5.tar.bz2 linux-stable-36e0a7371ef0054358d0dc1a7902aa0641fe40e5.zip |
nfs: Fix "Don't increment lock sequence ID after NFS4ERR_MOVED"
commit 406dab8450ec76eca88a1af2fc15d18a2b36ca49 upstream.
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>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/nfs4state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 3d88bc967c8e..f96c66b4d504 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1086,6 +1086,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; }; |