From 3d05b20435ca5fd8fac8156301f4f57d7e04f0d2 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 7 Oct 2021 00:28:59 +0200 Subject: [PATCH] btrfs-progs: use btrfs_bg_type_to_nparity in chunk_bytes_by_type Signed-off-by: David Sterba --- kernel-shared/volumes.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel-shared/volumes.c b/kernel-shared/volumes.c index c32f179f..e18d955a 100644 --- a/kernel-shared/volumes.c +++ b/kernel-shared/volumes.c @@ -1053,10 +1053,8 @@ static u64 chunk_bytes_by_type(struct alloc_chunk_ctl *ctl) return stripe_size; else if (type & BTRFS_BLOCK_GROUP_RAID10) return stripe_size * (ctl->num_stripes / ctl->sub_stripes); - else if (type & BTRFS_BLOCK_GROUP_RAID5) - return stripe_size * (ctl->num_stripes - 1); - else if (type & BTRFS_BLOCK_GROUP_RAID6) - return stripe_size * (ctl->num_stripes - 2); + else if (type & BTRFS_BLOCK_GROUP_RAID56_MASK) + return stripe_size * (ctl->num_stripes - btrfs_bg_type_to_nparity(type)); else return stripe_size * ctl->num_stripes; }