]> git.hungrycats.org Git - linux/commitdiff
Revert "btrfs: pass unaligned length to btrfs_cmp_data()"
authorZygo Blaxell <zblaxell@thirteen.furryterror.org>
Wed, 24 Jun 2015 20:49:55 +0000 (16:49 -0400)
committerZygo Blaxell <zblaxell@thirteen.furryterror.org>
Wed, 24 Jun 2015 20:49:55 +0000 (16:49 -0400)
This reverts commit 24b0b90f2683951cbc30ef326cbd43f69b4e6416.

fs/btrfs/ioctl.c

index ed4eacec795f610076a97426458f7e9e8483c4cb..86b0d08944808697f3630e9e74a83a04207406ba 100644 (file)
@@ -2926,8 +2926,7 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,
                goto out_unlock;
        }
 
-       /* pass original length for comparison so we stay within i_size */
-       ret = btrfs_cmp_data(src, loff, dst, dst_loff, olen);
+       ret = btrfs_cmp_data(src, loff, dst, dst_loff, len);
        if (ret == 0)
                ret = btrfs_clone(src, dst, loff, olen, len, dst_loff);