SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

copy: don't call clone ioctls twice

Browse Source 
The btrfs name and the generic name have the same values, hence there's
no point in bothering with the former.
This commit is contained in:
Lennart Poettering
2023-04-28 15:10:24 +02:00
parent 91010bd6cc
commit 427ad121c2
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/copy.c
+5 -9
View File
@@ -1610,13 +1610,11 @@ int reflink(int infd, int outfd) {
if (r < 0)
return r;
/* FICLONE was introduced in Linux 4.5, so let's fall back to BTRFS_IOC_CLONE if it's not supported. */
/* FICLONE was introduced in Linux 4.5 but it uses the same number as BTRFS_IOC_CLONE introduced earlier */
r = ioctl(outfd, FICLONE, infd);
if (r < 0 && ERRNO_IS_NOT_SUPPORTED(errno))
r = ioctl(outfd, BTRFS_IOC_CLONE, infd);
assert_cc(FICLONE == BTRFS_IOC_CLONE);
return RET_NERRNO(r);
return RET_NERRNO(ioctl(outfd, FICLONE, infd));
}
assert_cc(sizeof(struct file_clone_range) == sizeof(struct btrfs_ioctl_clone_range_args));
@@ -1637,9 +1635,7 @@ int reflink_range(int infd, uint64_t in_offset, int outfd, uint64_t out_offset,
if (r < 0)
return r;
r = ioctl(outfd, FICLONERANGE, &args);
if (r < 0 && ERRNO_IS_NOT_SUPPORTED(errno))
r = ioctl(outfd, BTRFS_IOC_CLONE_RANGE, &args);
assert_cc(FICLONERANGE == BTRFS_IOC_CLONE_RANGE);
return RET_NERRNO(r);
return RET_NERRNO(ioctl(outfd, FICLONERANGE, &args));
}