From d6c0e8249aa1573f6abf0f3c160c6b5b4501c9cf Mon Sep 17 00:00:00 2001
From: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date: Thu, 21 Mar 2013 14:30:23 +0000
Subject: [PATCH] --- yaml --- r: 361953 b: refs/heads/master c:
 adaa4b8e4d47eeb114513c2f7a172929154b94bd h: refs/heads/master i:   361951:
 2abce6c53abc7ac6e31b813e0664cec9edfb9274 v: v3

---
 [refs]                |  2 +-
 trunk/fs/btrfs/send.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d2ff8caca054..3fec2fa8cde9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4adaa611020fa6ac65b0ac8db78276af4ec04e63
+refs/heads/master: adaa4b8e4d47eeb114513c2f7a172929154b94bd
diff --git a/trunk/fs/btrfs/send.c b/trunk/fs/btrfs/send.c
index 68da757615ae..ed897dc11356 100644
--- a/trunk/fs/btrfs/send.c
+++ b/trunk/fs/btrfs/send.c
@@ -3945,12 +3945,10 @@ static int is_extent_unchanged(struct send_ctx *sctx,
 		    found_key.type != key.type) {
 			key.offset += right_len;
 			break;
-		} else {
-			if (found_key.offset != key.offset + right_len) {
-				/* Should really not happen */
-				ret = -EIO;
-				goto out;
-			}
+		}
+		if (found_key.offset != key.offset + right_len) {
+			ret = 0;
+			goto out;
 		}
 		key = found_key;
 	}