Signed-off-by: Matthew Friday <[email protected]>
---
fs/btrfs/ioctl.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 9c8e1734429c..6243f734c0cd 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3278,7 +3278,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,
struct inode *dst, u64 dst_loff)
{
int ret;
- int num_pages = PAGE_ALIGN(BTRFS_MAX_DEDUPE_LEN) >> PAGE_SHIFT;
u64 i, tail_len, chunk_count;
/* don't make the dst file partly checksummed */
@@ -3291,8 +3290,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,
tail_len = olen % BTRFS_MAX_DEDUPE_LEN;
chunk_count = div_u64(olen, BTRFS_MAX_DEDUPE_LEN);
- if (chunk_count == 0)
- num_pages = PAGE_ALIGN(tail_len) >> PAGE_SHIFT;
for (i = 0; i < chunk_count; i++) {
ret = btrfs_extent_same_range(src, loff, BTRFS_MAX_DEDUPE_LEN,
--
2.11.0
On 23.01.19 г. 0:59 ч., Matthew Friday wrote:
> Signed-off-by: Matthew Friday <[email protected]>
It seems you are using an outdated version of the code. When sending new
code always base it on misc-next branch from
https://github.com/kdave/btrfs-devel
> ---
> fs/btrfs/ioctl.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 9c8e1734429c..6243f734c0cd 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -3278,7 +3278,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,
> struct inode *dst, u64 dst_loff)
> {
> int ret;
> - int num_pages = PAGE_ALIGN(BTRFS_MAX_DEDUPE_LEN) >> PAGE_SHIFT;
> u64 i, tail_len, chunk_count;
>
> /* don't make the dst file partly checksummed */
> @@ -3291,8 +3290,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,
>
> tail_len = olen % BTRFS_MAX_DEDUPE_LEN;
> chunk_count = div_u64(olen, BTRFS_MAX_DEDUPE_LEN);
> - if (chunk_count == 0)
> - num_pages = PAGE_ALIGN(tail_len) >> PAGE_SHIFT;
>
> for (i = 0; i < chunk_count; i++) {
> ret = btrfs_extent_same_range(src, loff, BTRFS_MAX_DEDUPE_LEN,
>