Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 01:05:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert vfs_dedupe_file_range().

Browse Source 
fdput() is followed by checking fatal_signal_pending() (and aborting
the loop in such case).  fdput() is transposable with that check.
Yes, it'll probably end up with slightly fatter code (call after the
check has returned false + call on the almost never taken out-of-line path
instead of one call before the check), but it's not worth bothering with
explicit extra scope there (or dragging the check into the loop condition,
for that matter).

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2024-07-23 01:28:31 -04:00
parent 9bd812744d
commit 6b1a5ae9b5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/remap_range.c
View File

@ -536,7 +536,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
} }
for (i = 0, info = same->info; i < count; i++, info++) { for (i = 0, info = same->info; i < count; i++, info++) {
struct fd dst_fd = fdget(info->dest_fd); CLASS(fd, dst_fd)(info->dest_fd);
if (fd_empty(dst_fd)) { if (fd_empty(dst_fd)) {
info->status = -EBADF; info->status = -EBADF;
@ -545,7 +545,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
if (info->reserved) { if (info->reserved) {
info->status = -EINVAL; info->status = -EINVAL;
goto next_fdput; goto next_loop;
} }
deduped = vfs_dedupe_file_range_one(file, off, fd_file(dst_fd), deduped = vfs_dedupe_file_range_one(file, off, fd_file(dst_fd),
@ -558,8 +558,6 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
else else
info->bytes_deduped = len; info->bytes_deduped = len;
next_fdput:
fdput(dst_fd);
next_loop: next_loop:
if (fatal_signal_pending(current)) if (fatal_signal_pending(current))
break; break;