diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2021-03-08 18:51:51 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-20 12:43:43 +0300 |
| commit | 894ecf0cb505561b9f37b302b7479eea939b0790 (patch) | |
| tree | a38b7197be6da4d495d87b1e9e1cc4da7db9d09a /fs/nfsd | |
| parent | d955f13ea2120269319d6133d0dd82b66d1eeca3 (diff) | |
| download | linux-894ecf0cb505561b9f37b302b7479eea939b0790.tar.xz | |
Revert "nfsd4: remove check_conflicting_opens warning"
commit 4aa5e002034f0701c3335379fd6c22d7f3338cce upstream.
This reverts commit 50747dd5e47b "nfsd4: remove check_conflicting_opens
warning", as a prerequisite for reverting 94415b06eb8a, which has a
serious bug.
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 47006eec724e..894cba1294f0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4957,6 +4957,7 @@ static int nfsd4_check_conflicting_opens(struct nfs4_client *clp, writes--; if (fp->fi_fds[O_RDWR]) writes--; + WARN_ON_ONCE(writes < 0); if (writes > 0) return -EAGAIN; spin_lock(&fp->fi_lock); |