sugar/linux
1
0
Fork 0
Code Activity

ceph: add destination file data sync before doing any remote copy

Browse Source 
If we try to copy into a file that was just written, any data that is
remote copied will be overwritten by our buffered writes once they are
flushed.  When this happens, the call to invalidate_inode_pages2_range
will also return a -EBUSY error.

This patch fixes this by also sync'ing the destination file before
starting any copy.

Fixes: 503f82a993 ("ceph: support copy_file_range file operation")
Signed-off-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Luis Henriques
2018-10-23 16:53:14 +00:00
committed by Ilya Dryomov
parent 651022382c
commit c2c6d3ce0d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ceph/file.c
View File

@@ -1931,10 +1931,17 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off,
if (!prealloc_cf) if (!prealloc_cf)
return -ENOMEM; return -ENOMEM;
/* Start by sync'ing the source file */ /* Start by sync'ing the source and destination files */
ret = file_write_and_wait_range(src_file, src_off, (src_off + len)); ret = file_write_and_wait_range(src_file, src_off, (src_off + len));
if (ret < 0) if (ret < 0) {
dout("failed to write src file (%zd)\n", ret);
goto out; goto out;
}
ret = file_write_and_wait_range(dst_file, dst_off, (dst_off + len));
if (ret < 0) {
dout("failed to write dst file (%zd)\n", ret);
goto out;
}
/* /*
* We need FILE_WR caps for dst_ci and FILE_RD for src_ci as other * We need FILE_WR caps for dst_ci and FILE_RD for src_ci as other