summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2025-09-06 10:54:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-09-19 16:37:28 +0200
commit5ae2ee9e1cd67de834b2dc60397304ac24a84817 (patch)
treecefd1611ec03fb2765fcba5a9b6f8d06824da9ad
parent55efebe6b38d4f5a5a0f4bc7a07283538a7f3f76 (diff)
NFSv4.2: Serialise O_DIRECT i/o and copy range
[ Upstream commit ca247c89900ae90207f4d321e260cd93b7c7d104 ] Ensure that all O_DIRECT reads and writes complete before copying a file range, so that the destination is up to date. Fixes: a5864c999de6 ("NFS: Do not serialise O_DIRECT reads and writes") Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/nfs/nfs42proc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 3774d5b64ba0..48ee3d5d89c4 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -431,6 +431,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,
return status;
}
+ nfs_file_block_o_direct(NFS_I(dst_inode));
status = nfs_sync_inode(dst_inode);
if (status)
return status;