summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAnsgar Lößer <ansgar.loesser@tu-darmstadt.de>2022-07-13 20:51:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2022-07-13 21:08:14 +0200
commit4a57a8400075bc5287c5c877702c68aeae2a033d (patch)
tree89ee061d5956064e266c4031cebe5f0b2370e14a /fs
parentMerge tag 'cgroup-for-5.19-rc6-fixes' of git://git.kernel.org/pub/scm/linux/k... (diff)
downloadlinux-4a57a8400075bc5287c5c877702c68aeae2a033d.tar.xz
linux-4a57a8400075bc5287c5c877702c68aeae2a033d.zip
vf/remap: return the amount of bytes actually deduplicated
When using the FIDEDUPRANGE ioctl, in case of success the requested size is returned. In some cases this might not be the actual amount of bytes deduplicated. This change modifies vfs_dedupe_file_range() to report the actual amount of bytes deduplicated, instead of the requested amount. Link: https://lore.kernel.org/linux-fsdevel/5548ef63-62f9-4f46-5793-03165ceccacc@tu-darmstadt.de/ Reported-by: Ansgar Lößer <ansgar.loesser@kom.tu-darmstadt.de> Reported-by: Max Schlecht <max.schlecht@informatik.hu-berlin.de> Reported-by: Björn Scheuermann <scheuermann@kom.tu-darmstadt.de> Cc: Dave Chinner <david@fromorbit.com> Cc: Darrick J Wong <djwong@kernel.org> Signed-off-by: Ansgar Lößer <ansgar.loesser@kom.tu-darmstadt.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/remap_range.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/remap_range.c b/fs/remap_range.c
index 881a306ee247..5e0d97e02f96 100644
--- a/fs/remap_range.c
+++ b/fs/remap_range.c
@@ -547,7 +547,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
else if (deduped < 0)
info->status = deduped;
else
- info->bytes_deduped = len;
+ info->bytes_deduped = deduped;
next_fdput:
fdput(dst_fd);