Revert "NFS: Make close(2) asynchronous when closing NFS O_DIRECT files" (4eae5014) · Commits · 戴 / test

This reverts commit . This commit causes a NFSv4 regression in that close()+unlink() can end up failing. The reason is that we no longer have a guarantee that the CLOSE has completed on the server, meaning that the subsequent call to REMOVE may fail with NFS4ERR_FILE_OPEN if the server implements Windows unlink() semantics. Reported-by:

<Olga Kornievskaia <aglo@umich.edu> Cc: Chuck Lever <chuck.lever@oracle.com> Signed-off-by:

Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/inode.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -853,6 +853,11 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
		}
		EXPORT_SYMBOL_GPL(put_nfs_open_context);

		static void put_nfs_open_context_sync(struct nfs_open_context *ctx)
		{
		__put_nfs_open_context(ctx, 1);
		}

		/*
		* Ensure that mmap has a recent RPC credential for use when writing out
		* shared pages
		@@ -908,7 +913,7 @@ void nfs_file_clear_open_context(struct file *filp)
		spin_lock(&inode->i_lock);
		list_move_tail(&ctx->list, &NFS_I(inode)->open_files);
		spin_unlock(&inode->i_lock);
		__put_nfs_open_context(ctx, filp->f_flags & O_DIRECT ? 0 : 1);
		put_nfs_open_context_sync(ctx);
		}
		}

Admin message