From 2d5c17dd96535a35c7f9b793a8828feb09c4a83a Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Wed, 1 Aug 2012 12:46:05 +0200 Subject: [PATCH] --- yaml --- r: 332512 b: refs/heads/master c: 3954096d4b1adab6fbb3c26de37ddd4f781e072f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/send.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97781702231c..f09c60a903cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dc67d0ba915cda01ed3a980502945edf2c46b70 +refs/heads/master: 3954096d4b1adab6fbb3c26de37ddd4f781e072f diff --git a/trunk/fs/btrfs/send.c b/trunk/fs/btrfs/send.c index cfbe987f854b..35222d5420f6 100644 --- a/trunk/fs/btrfs/send.c +++ b/trunk/fs/btrfs/send.c @@ -3819,8 +3819,8 @@ static int is_extent_unchanged(struct send_ctx *sctx, /* * Check if we have the same extent. */ - if (left_disknr + left_offset_fixed != - right_disknr + right_offset) { + if (left_disknr != right_disknr || + left_offset_fixed != right_offset) { ret = 0; goto out; }