NFSD: Fix problem of COMMIT and NFS4ERR_DELAY in infinite loop

The following request sequence to the same file causes the NFS client and
server getting into an infinite loop with COMMIT and NFS4ERR_DELAY:

OPEN
REMOVE
WRITE
COMMIT

Problem reported by recall11, recall12, recall14, recall20, recall22,
recall40, recall42, recall48, recall50 of nfstest suite.

This patch restores the handling of race condition in nfsd_file_do_acquire
with unlink to that prior of the regression.

Fixes: ac3a2585f018 ("nfsd: rework refcounting in filecache")
Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index f40d8f3b35a4ca8ac043575cbe6cf427bde3cd15..ee9c923192e08a60a8e038a0621d86f4db442c0d 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -1099,8 +1099,6 @@ open_file:
         * then unhash.
         */
        if (status != nfs_ok || inode->i_nlink == 0)
-               status = nfserr_jukebox;
-       if (status != nfs_ok)
                nfsd_file_unhash(nf);
        clear_and_wake_up_bit(NFSD_FILE_PENDING, &nf->nf_flags);
        if (status == nfs_ok)