---

yaml --- r: 332602 b: refs/heads/master c: 7a2d6a6 h: refs/heads/master v: v3
git-mirror · Oct 9, 2012 · 5cda5a6 · 5cda5a6
1 parent 434fc3f
commit 5cda5a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d1a1317af439cc7f349907b79198d35feffe179
+refs/heads/master: 7a2d6a64645b38d7040bbd031c7a7b2655f5d976
diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c
@@ -2110,7 +2110,7 @@ static int bio_readpage_error(struct bio *failed_bio, struct page *page,
 		}
 		read_unlock(&em_tree->lock);
 
-		if (!em || IS_ERR(em)) {
+		if (!em) {
 			kfree(failrec);
 			return -EIO;
 		}