---

yaml --- r: 360473 b: refs/heads/master c: 1f0905e h: refs/heads/master i: 360471: e8f996e v: v3
git-mirror · Feb 5, 2013 · 7318180 · 7318180
1 parent b29dd2b
commit 7318180
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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");