NFSv4.2: Serialise O_DIRECT i/o and fallocate()

[ Upstream commit b93128f29733af5d427a335978a19884c2c230e2 ]

Ensure that all O_DIRECT reads and writes complete before calling
fallocate so that we don't race w.r.t. attribute updates.

Fixes: 99f237832243 ("NFSv4.2: Always flush out writes in nfs42_proc_fallocate()")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 9f0d69e6526443d48d48000f174e993b450399b7..66fe885fc19a10904aa6ee2162ae9099108a4286 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -112,6 +112,7 @@ static int nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep,
        exception.inode = inode;
        exception.state = lock->open_context->state;
 
+       nfs_file_block_o_direct(NFS_I(inode));
        err = nfs_sync_inode(inode);
        if (err)
                goto out;