From 9b0badfea824cf959d564a021cf02501e70d7a10 Mon Sep 17 00:00:00 2001
From: Stefan Behrens <sbehrens@giantdisaster.de>
Date: Fri, 10 Aug 2012 08:58:21 -0600
Subject: [PATCH] --- yaml --- r: 322374 b: refs/heads/master c:
 256dd1bb3750ac5ad49b40887c1691788dc44b33 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/disk-io.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59dba9653bc9..00ef481cf6ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d280e5be940931c84bb2e9831ead9d02bc785484
+refs/heads/master: 256dd1bb3750ac5ad49b40887c1691788dc44b33
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 3c4c4397f470..29c69e60d3b0 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -377,9 +377,13 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
 		ret = read_extent_buffer_pages(io_tree, eb, start,
 					       WAIT_COMPLETE,
 					       btree_get_extent, mirror_num);
-		if (!ret && !verify_parent_transid(io_tree, eb,
+		if (!ret) {
+			if (!verify_parent_transid(io_tree, eb,
 						   parent_transid, 0))
-			break;
+				break;
+			else
+				ret = -EIO;
+		}
 
 		/*
 		 * This buffer's crc is fine, but its contents are corrupted, so