From e7d6111d959aa126ef88ed50f2a3fad4057fb0ac Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Wed, 27 Jan 2010 02:07:59 +0000
Subject: [PATCH] --- yaml --- r: 180055 b: refs/heads/master c:
 f48b90756bd834dda852ff514f2690d3175b1f44 h: refs/heads/master i:   180053:
 1156a2ce593e417fc552c94bd831779bc3d55f08   180051:
 b3e050452fd43a9c2ecde79bb06e40108be9ee05   180047:
 ea2331c756e1852cbc55c23f0715988df1a60fae v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/volumes.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d09633dda5e2..f99234e56725 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3acc2a6850efff647f1c5458524eb3a8bcba20a
+refs/heads/master: f48b90756bd834dda852ff514f2690d3175b1f44
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index 220dad5db017..66122bdf8bbf 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -2538,6 +2538,11 @@ int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset)
 	if (!em)
 		return 1;
 
+	if (btrfs_test_opt(root, DEGRADED)) {
+		free_extent_map(em);
+		return 0;
+	}
+
 	map = (struct map_lookup *)em->bdev;
 	for (i = 0; i < map->num_stripes; i++) {
 		if (!map->stripes[i].dev->writeable) {