Commit 4aa5e002 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Chuck Lever

Revert "nfsd4: remove check_conflicting_opens warning"

This reverts commit 50747dd5 "nfsd4: remove check_conflicting_opens
warning", as a prerequisite for reverting 94415b06, which has a
serious bug.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 0ddc9423
...@@ -4952,6 +4952,7 @@ static int nfsd4_check_conflicting_opens(struct nfs4_client *clp, ...@@ -4952,6 +4952,7 @@ static int nfsd4_check_conflicting_opens(struct nfs4_client *clp,
writes--; writes--;
if (fp->fi_fds[O_RDWR]) if (fp->fi_fds[O_RDWR])
writes--; writes--;
WARN_ON_ONCE(writes < 0);
if (writes > 0) if (writes > 0)
return -EAGAIN; return -EAGAIN;
spin_lock(&fp->fi_lock); spin_lock(&fp->fi_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment