diff options
| author | Mark Fasheh <mfasheh@suse.de> | 2015-06-30 14:42:04 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-07-01 17:17:13 -0700 |
| commit | 207910ddeeda38fd54544d94f8c8ca5a9632cc25 (patch) | |
| tree | 1d44e13585134d22b5d62a48a67c8cebab6154c5 /fs/btrfs | |
| parent | a89ca6f24ffe435edad57de02eaabd37a2c6bff6 (diff) | |
| download | linux-207910ddeeda38fd54544d94f8c8ca5a9632cc25.tar.gz | |
btrfs: pass unaligned length to btrfs_cmp_data()
In the case that we dedupe the tail of a file, we might expand the dedupe
len out to the end of our last block. We don't want to compare data past
i_size however, so pass the original length to btrfs_cmp_data().
Signed-off-by: Mark Fasheh <mfasheh@suse.de>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index c86b835da7a8..55504338491d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2943,7 +2943,8 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen, goto out_unlock; } - ret = btrfs_cmp_data(src, loff, dst, dst_loff, len); + /* pass original length for comparison so we stay within i_size */ + ret = btrfs_cmp_data(src, loff, dst, dst_loff, olen); if (ret == 0) ret = btrfs_clone(src, dst, loff, olen, len, dst_loff); |