diff options
| author | Josef Bacik <josef@redhat.com> | 2010-01-27 02:09:38 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-01-28 16:20:39 -0500 |
| commit | 035fe03a7ad56982b30ab3a522b7b08d58feccd0 (patch) | |
| tree | f3502142234e7d28df3e32b9b2cd26869db4b4d6 /fs/btrfs/volumes.c | |
| parent | 7f59203abeaf18bf3497b308891f95a4489810ad (diff) | |
| download | linux-035fe03a7ad56982b30ab3a522b7b08d58feccd0.tar.gz linux-035fe03a7ad56982b30ab3a522b7b08d58feccd0.tar.bz2 linux-035fe03a7ad56982b30ab3a522b7b08d58feccd0.zip | |
Btrfs: check total number of devices when removing missing
If you have a disk failure in RAID1 and then add a new disk to the
array, and then try to remove the missing volume, it will fail. The
reason is the sanity check only looks at the total number of rw devices,
which is just 2 because we have 2 good disks and 1 bad one. Instead
check the total number of devices in the array to make sure we can
actually remove the device. Tested this with a failed disk setup and
with this test we can now run
btrfs-vol -r missing /mount/point
and it works fine.
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5eb7459e3782..41ecbb2347f2 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1135,7 +1135,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) root->fs_info->avail_metadata_alloc_bits; if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) && - root->fs_info->fs_devices->rw_devices <= 4) { + root->fs_info->fs_devices->num_devices <= 4) { printk(KERN_ERR "btrfs: unable to go below four devices " "on raid10\n"); ret = -EINVAL; @@ -1143,7 +1143,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) } if ((all_avail & BTRFS_BLOCK_GROUP_RAID1) && - root->fs_info->fs_devices->rw_devices <= 2) { + root->fs_info->fs_devices->num_devices <= 2) { printk(KERN_ERR "btrfs: unable to go below two " "devices on raid1\n"); ret = -EINVAL; |