From 7318180f0cb27fc6656fb872250c6ac2391a087a Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Tue, 5 Feb 2013 10:01:42 -0500 Subject: [PATCH] --- yaml --- r: 360473 b: refs/heads/master c: 1f0905ec156eec8f12cd593bc564551770319720 h: refs/heads/master i: 360471: e8f996e8167452092109a4169684979eb5d8140f v: v3 --- [refs] | 2 +- trunk/fs/btrfs/volumes.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f9fc9228e579..bde5c6b7e31c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10e78e3a8aec820f8f6344dfd4d465f5f84399e6 +refs/heads/master: 1f0905ec156eec8f12cd593bc564551770319720 diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index c372264b85bf..77620f2d8af9 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -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");