diff options
author | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 10:01:42 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 10:01:42 -0500 |
commit | 1f0905ec156eec8f12cd593bc564551770319720 (patch) | |
tree | 352279b0e4c992041528edf029fe4f3f1bc4843e | |
parent | 10e78e3a8aec820f8f6344dfd4d465f5f84399e6 (diff) |
Btrfs: remove conflicting check for minimum number of devices in raid56
The device removal code was incorrectly checking against two different limits for
raid5 and raid6.
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
-rw-r--r-- | fs/btrfs/volumes.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index c372264b85bf..77620f2d8af9 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -1392,14 +1392,6 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) | |||
1392 | } | 1392 | } |
1393 | btrfs_dev_replace_unlock(&root->fs_info->dev_replace); | 1393 | btrfs_dev_replace_unlock(&root->fs_info->dev_replace); |
1394 | 1394 | ||
1395 | if ((all_avail & (BTRFS_BLOCK_GROUP_RAID5 | | ||
1396 | BTRFS_BLOCK_GROUP_RAID6) && num_devices <= 3)) { | ||
1397 | printk(KERN_ERR "btrfs: unable to go below three devices " | ||
1398 | "on raid5 or raid6\n"); | ||
1399 | ret = -EINVAL; | ||
1400 | goto out; | ||
1401 | } | ||
1402 | |||
1403 | if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) && num_devices <= 4) { | 1395 | if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) && num_devices <= 4) { |
1404 | printk(KERN_ERR "btrfs: unable to go below four devices " | 1396 | printk(KERN_ERR "btrfs: unable to go below four devices " |
1405 | "on raid10\n"); | 1397 | "on raid10\n"); |