| From: Chuck Lever <chuck.lever@oracle.com> |
| Date: Thu, 26 Jan 2017 15:14:52 -0500 |
| Subject: 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> |
| --- |
| fs/nfs/nfs4state.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/fs/nfs/nfs4state.c |
| +++ b/fs/nfs/nfs4state.c |
| @@ -1086,6 +1086,7 @@ static void nfs_increment_seqid(int stat |
| case -NFS4ERR_BADXDR: |
| case -NFS4ERR_RESOURCE: |
| case -NFS4ERR_NOFILEHANDLE: |
| + case -NFS4ERR_MOVED: |
| /* Non-seqid mutating errors */ |
| return; |
| }; |
