dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 09:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared/copy: simplify argument convention for reflink_range

Browse Source 
reflink_range() would treat size==UINT64_MAX as "copy everything", but
only if the offsets were 0. There are only two callers: one always passes
a fixed size, the other translated size==UINT64_MAX to 0. Make things
more uniform by always treating size==UINT64_MAX the same as size==0.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-07-15 12:59:45 +02:00
parent 5efd4688a9
commit 8437a7605a
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/shared/copy.c
View File

@@ -152,7 +152,7 @@ static int try_reflink_copy_bytes(
if (toffset < 0)
return -EOPNOTSUPP;
r = reflink_range(fdf, foffset, fdt, toffset, max_bytes == UINT64_MAX ? 0 : max_bytes);
r = reflink_range(fdf, foffset, fdt, toffset, max_bytes);
if (r < 0)
return -EOPNOTSUPP;
@@ -1748,22 +1748,19 @@ int reflink(int infd, int outfd) {
assert_cc(sizeof(struct file_clone_range) == sizeof(struct btrfs_ioctl_clone_range_args));
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,
.src_length = sz,
.dest_offset = out_offset,
};
int reflink_range(int infd, uint64_t in_offset, int outfd, uint64_t out_offset, uint64_t size) {
int r;
assert(infd >= 0);
assert(outfd >= 0);
/* size==UINT64_MAX mean "clone everything". Translate to 0 for the kernel. */
if (size == UINT64_MAX)
size = 0;
/* Inside the kernel, FICLONE is identical to FICLONERANGE with offsets and size set to zero, let's
* simplify things and use the simple ioctl in that case. Also, do the same if the size is
* UINT64_MAX, which is how we usually encode "everything". */
if (in_offset == 0 && out_offset == 0 && IN_SET(sz, 0, UINT64_MAX))
* simplify things and use the simple ioctl in that case. */
if (in_offset == 0 && out_offset == 0 && size == 0)
return reflink(infd, outfd);
r = fd_verify_regular(outfd);
@@ -1772,5 +1769,11 @@ int reflink_range(int infd, uint64_t in_offset, int outfd, uint64_t out_offset,
assert_cc(FICLONERANGE == BTRFS_IOC_CLONE_RANGE);
struct file_clone_range args = {
.src_fd = infd,
.src_offset = in_offset,
.src_length = size,
.dest_offset = out_offset,
};
return RET_NERRNO(ioctl(outfd, FICLONERANGE, &args));
}

2
src/shared/copy.h
View File

@@ -109,4 +109,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_range(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 size);