path: root/fs
diff options
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-09-04 15:17:53 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-09-04 16:54:29 -0400
commit4eae50143bcbfda819c650b7ed6739f3b6338ffc (patch)
tree61a335f9bcd639676317891587edda76c249fe2a /fs
parent5cf9d70659594e1a75b34d18619d0bb6e0cbbafa (diff)
Revert "NFS: Make close(2) asynchronous when closing NFS O_DIRECT files"
This reverts commit f895c53f8ace3c3e49ebf9def90e63fc6d46d2bf. 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>
Diffstat (limited to 'fs')
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 6307d8de103d..326d9e10d833 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -853,6 +853,11 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
+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)
list_move_tail(&ctx->list, &NFS_I(inode)->open_files);
- __put_nfs_open_context(ctx, filp->f_flags & O_DIRECT ? 0 : 1);
+ put_nfs_open_context_sync(ctx);

Privacy Policy