diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2018-01-28 09:29:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-16 20:22:59 +0100 |
commit | f1e31607e73d5f4546ff8d1e40e1153230392188 (patch) | |
tree | 94a1eaabff124784cc6d521770e146775999d934 /fs/nfs | |
parent | 1c38ad2f26d8511cde75ce5767313e8c3e789d69 (diff) | |
download | linux-stable-f1e31607e73d5f4546ff8d1e40e1153230392188.tar.gz linux-stable-f1e31607e73d5f4546ff8d1e40e1153230392188.tar.bz2 linux-stable-f1e31607e73d5f4546ff8d1e40e1153230392188.zip |
NFS: Fix a race between mmap() and O_DIRECT
commit e231c6879cfd44e4fffd384bb6dd7d313249a523 upstream.
When locking the file in order to do O_DIRECT on it, we must unmap
any mmapped ranges on the pagecache so that we can flush out the
dirty data.
Fixes: a5864c999de67 ("NFS: Do not serialise O_DIRECT reads and writes")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/io.c b/fs/nfs/io.c index 20fef85d2bb1..9034b4926909 100644 --- a/fs/nfs/io.c +++ b/fs/nfs/io.c @@ -99,7 +99,7 @@ static void nfs_block_buffered(struct nfs_inode *nfsi, struct inode *inode) { if (!test_bit(NFS_INO_ODIRECT, &nfsi->flags)) { set_bit(NFS_INO_ODIRECT, &nfsi->flags); - nfs_wb_all(inode); + nfs_sync_mapping(inode->i_mapping); } } |