diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 09:41:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 09:41:41 +0200 |
| commit | 927d2c21f2e82b93c791799c8da932a9bdffb436 (patch) | |
| tree | aec52fd2d3903751d696e809628d155c825ac730 /fs/nfs/nfs4proc.c | |
| parent | cf31b7dd51b542f9a9b2d0de416b5524dfdb1cf2 (diff) | |
| parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
| download | linux-927d2c21f2e82b93c791799c8da932a9bdffb436.tar.bz2 | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ffd2e712595d..d90132642340 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2553,9 +2553,8 @@ static int nfs41_check_open_stateid(struct nfs4_state *state) clear_bit(NFS_O_RDWR_STATE, &state->flags); clear_bit(NFS_OPEN_STATE, &state->flags); stateid->type = NFS4_INVALID_STATEID_TYPE; - } - if (status != NFS_OK) return status; + } if (nfs_open_stateid_recover_openmode(state)) return -NFS4ERR_OPENMODE; return NFS_OK; |