Skip to content

Commit b926f2a

Browse files
committed
Revert "vf/remap: return the amount of bytes actually deduplicated"
This reverts commit 4a57a84. Dave Chinner reports: "As I suspected would occur, this change causes test failures. e.g generic/517 in fstests fails with: generic/517 1s ... - output mismatch [..] -deduped 131172/131172 bytes at offset 65536 +deduped 131072/131172 bytes at offset 65536" can you please revert this commit for the 5.19 series to give us more time to investigate and consider the impact of the the API change on userspace applications before we commit to changing the API" That changed return value seems to reflect reality, but with the fstest change, let's revert for now. Requested-by: Dave Chinner <david@fromorbit.com> Link: https://lore.kernel.org/all/20220714223238.GH3600936@dread.disaster.area/ Cc: Ansgar Lößer <ansgar.loesser@tu-darmstadt.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent db88697 commit b926f2a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/remap_range.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
547547
else if (deduped < 0)
548548
info->status = deduped;
549549
else
550-
info->bytes_deduped = deduped;
550+
info->bytes_deduped = len;
551551

552552
next_fdput:
553553
fdput(dst_fd);

0 commit comments

Comments
 (0)