diff options
author | Luca Boccassi <bluca@debian.org> | 2023-04-28 11:34:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-28 11:34:41 +0100 |
commit | 91010bd6ccd363be9e09f22c60d45f5e27c1d2a8 (patch) | |
tree | 75aad1e83b20e261f9aa239697894af66f70e93b /src/shared | |
parent | 657152a459f8bc30d004a70298e81a0ad896fbfd (diff) | |
parent | d6f96778b18ffb2a457a14dd951843846819e89b (diff) | |
download | systemd-91010bd6ccd363be9e09f22c60d45f5e27c1d2a8.tar.gz |
Merge pull request #27440 from yuwata/reflink-follow-ups
copy: follow ups for reflink()
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/copy.c | 4 | ||||
-rw-r--r-- | src/shared/copy.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/copy.c b/src/shared/copy.c index dd1306abe9..6a5a52309a 100644 --- a/src/shared/copy.c +++ b/src/shared/copy.c @@ -203,7 +203,7 @@ int copy_bytes_full( if (foffset == 0 && toffset == 0 && max_bytes == UINT64_MAX) r = reflink(fdf, fdt); /* full file reflink */ else - r = reflink_full(fdf, foffset, fdt, toffset, max_bytes == UINT64_MAX ? 0 : max_bytes); /* partial reflink */ + r = reflink_range(fdf, foffset, fdt, toffset, max_bytes == UINT64_MAX ? 0 : max_bytes); /* partial reflink */ if (r >= 0) { off_t t; @@ -1621,7 +1621,7 @@ int reflink(int infd, int outfd) { assert_cc(sizeof(struct file_clone_range) == sizeof(struct btrfs_ioctl_clone_range_args)); -int reflink_full(int infd, uint64_t in_offset, int outfd, uint64_t out_offset, uint64_t sz) { +int reflink_range(int infd, uint64_t in_offset, int outfd, uint64_t out_offset, uint64_t sz) { struct file_clone_range args = { .src_fd = infd, .src_offset = in_offset, diff --git a/src/shared/copy.h b/src/shared/copy.h index 4f97e542f5..c4482eba7e 100644 --- a/src/shared/copy.h +++ b/src/shared/copy.h @@ -106,4 +106,4 @@ static inline int copy_rights(int fdf, int fdt) { int copy_xattr(int df, const char *from, int dt, const char *to, CopyFlags copy_flags); int reflink(int infd, int outfd); -int reflink_full(int infd, uint64_t in_offset, int outfd, uint64_t out_offset, uint64_t sz); +int reflink_range(int infd, uint64_t in_offset, int outfd, uint64_t out_offset, uint64_t sz); |