Browse Source

Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk()

We can use this simple method to make source more readable.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Zhao Lei 15 years ago
parent
commit
f3eae7e8a5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      fs/btrfs/volumes.c

+ 2 - 2
fs/btrfs/volumes.c

@@ -2198,9 +2198,9 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 		min_stripes = 2;
 		min_stripes = 2;
 	}
 	}
 	if (type & (BTRFS_BLOCK_GROUP_RAID1)) {
 	if (type & (BTRFS_BLOCK_GROUP_RAID1)) {
-		num_stripes = min_t(u64, 2, fs_devices->rw_devices);
-		if (num_stripes < 2)
+		if (fs_devices->rw_devices < 2)
 			return -ENOSPC;
 			return -ENOSPC;
+		num_stripes = 2;
 		min_stripes = 2;
 		min_stripes = 2;
 	}
 	}
 	if (type & (BTRFS_BLOCK_GROUP_RAID10)) {
 	if (type & (BTRFS_BLOCK_GROUP_RAID10)) {