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

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>

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index e2fea37c53484b631c1d8cafb299ab001205bbfa..1a169372ca16e1ba49b77a738d4a169d959bb6e0 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -114,6 +114,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;