Skip to content

Commit

Permalink
Revert "nfsd4: remove check_conflicting_opens warning"
Browse files Browse the repository at this point in the history
commit 4aa5e00 upstream.

This reverts commit 50747dd "nfsd4: remove check_conflicting_opens
warning", as a prerequisite for reverting 94415b0, 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>
  • Loading branch information
J. Bruce Fields authored and gregkh committed Mar 20, 2021
1 parent d955f13 commit 894ecf0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions fs/nfsd/nfs4state.c
Expand Up @@ -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);
Expand Down

0 comments on commit 894ecf0

Please sign in to comment.