summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2010-01-27 02:07:59 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:20:08 -0700
commit020009fcab2690bb6ecfdc75bcdeed1833d4c8f5 (patch)
treeb7fb5b221d0917c96944c42b2eae674d8b863e18
parent8766aeadf9ad4dbabfee5176eca09e38c950c191 (diff)
downloadkernel-common-020009fcab2690bb6ecfdc75bcdeed1833d4c8f5.tar.gz
kernel-common-020009fcab2690bb6ecfdc75bcdeed1833d4c8f5.tar.bz2
kernel-common-020009fcab2690bb6ecfdc75bcdeed1833d4c8f5.zip
Btrfs: do not mark the chunk as readonly if in degraded mode
commit f48b90756bd834dda852ff514f2690d3175b1f44 upstream. If a RAID setup has chunks that span multiple disks, and one of those disks has failed, btrfs_chunk_readonly will return 1 since one of the disks in that chunk's stripes is dead and therefore not writeable. So instead if we are in degraded mode, return 0 so we can go ahead and allocate stuff. Without this patch all of the block groups in a RAID1 setup will end up read-only, which will mean we can't add new disks to the array since we won't be able to make allocations. Signed-off-by: Josef Bacik <josef@redhat.com> Signed-off-by: Chris Mason <chris.mason@oracle.com> Acked-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/btrfs/volumes.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 220dad5db017..66122bdf8bbf 100644
--- a/fs/btrfs/volumes.c
+++ b/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) {