Btrfs: remove conflicting check for minimum number of devices in raid56
authorChris Mason <chris.mason@fusionio.com>
Tue, 5 Feb 2013 15:01:42 +0000 (10:01 -0500)
committerChris Mason <chris.mason@fusionio.com>
Tue, 5 Feb 2013 15:01:42 +0000 (10:01 -0500)
The device removal code was incorrectly checking against two different limits for
raid5 and raid6.

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
fs/btrfs/volumes.c

index c372264..77620f2 100644 (file)
@@ -1392,14 +1392,6 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
        }
        btrfs_dev_replace_unlock(&root->fs_info->dev_replace);
 
-       if ((all_avail & (BTRFS_BLOCK_GROUP_RAID5 |
-                         BTRFS_BLOCK_GROUP_RAID6) && num_devices <= 3)) {
-               printk(KERN_ERR "btrfs: unable to go below three devices "
-                      "on raid5 or raid6\n");
-               ret = -EINVAL;
-               goto out;
-       }
-
        if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) && num_devices <= 4) {
                printk(KERN_ERR "btrfs: unable to go below four devices "
                       "on raid10\n");