Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b79d8854 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

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: a5864c99 ("NFS: Do not serialise O_DIRECT reads and writes")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 967f650f

fs/nfs/io.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,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);

	}

}