mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-06 22:55:11 +00:00
Revert "NFS: Make close(2) asynchronous when closing NFS O_DIRECT files"
This reverts commit f895c53f8a
.
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>
This commit is contained in:
parent
5cf9d70659
commit
4eae50143b
1 changed files with 6 additions and 1 deletions
|
@ -853,6 +853,11 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(put_nfs_open_context);
|
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
|
* Ensure that mmap has a recent RPC credential for use when writing out
|
||||||
* shared pages
|
* shared pages
|
||||||
|
@ -908,7 +913,7 @@ void nfs_file_clear_open_context(struct file *filp)
|
||||||
spin_lock(&inode->i_lock);
|
spin_lock(&inode->i_lock);
|
||||||
list_move_tail(&ctx->list, &NFS_I(inode)->open_files);
|
list_move_tail(&ctx->list, &NFS_I(inode)->open_files);
|
||||||
spin_unlock(&inode->i_lock);
|
spin_unlock(&inode->i_lock);
|
||||||
__put_nfs_open_context(ctx, filp->f_flags & O_DIRECT ? 0 : 1);
|
put_nfs_open_context_sync(ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue