---

yaml --- r: 180057 b: refs/heads/master c: 035fe03 h: refs/heads/master i: 180055: e7d6111 v: v3
git-mirror · Jan 28, 2010 · fc4c5f0 · fc4c5f0
1 parent a41dc3a
commit fc4c5f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f59203abeaf18bf3497b308891f95a4489810ad
+refs/heads/master: 035fe03a7ad56982b30ab3a522b7b08d58feccd0
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
@@ -1135,15 +1135,15 @@ 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;
 		goto out;
 	}
 
 	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;