diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2021-03-08 10:51:51 -0500 |
|---|---|---|
| committer |   Chuck Lever <chuck.lever@oracle.com> | 2021-03-09 10:37:34 -0500 |
| commit | 4aa5e002034f0701c3335379fd6c22d7f3338cce (patch) | |
| tree | 435a38ed605539de22d20d0d0095d00fb9c186a0 /fs | |
| parent | rpc: fix NULL dereference on kmalloc failure (diff) | |
| download | linux-dev-4aa5e002034f0701c3335379fd6c22d7f3338cce.tar.xz linux-dev-4aa5e002034f0701c3335379fd6c22d7f3338cce.zip | |
Revert "nfsd4: remove check_conflicting_opens warning"
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>
Diffstat (limited to 'fs')
| -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 61552e89bd89..482e241c9639 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4952,6 +4952,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); |