RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-22 04:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: cache number of devices for chunk allocation

Browse Source 
Cache the total number of devices usable for chunk allocation in
alloc_chunk_ctl instread of reading it from the super-block over and over
again.

As it's a) unlikely to have more than 4 billion devices and the result of
the max_t() gets truncated to int anyways, change the max_t calls to
simple max(), while we're at it.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Johannes Thumshirn 2020-06-10 21:32:47 +09:00 committed by David Sterba
parent ab470de0fa
commit 53bcec4e39
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
volumes.c
View File

@ -1042,6 +1042,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
ctl.min_stripes = 1;
ctl.sub_stripes = 1;
ctl.stripe_len = BTRFS_STRIPE_LEN;
ctl.total_devs = btrfs_super_num_devices(info->super_copy);
if (type & BTRFS_BLOCK_GROUP_PROFILE_MASK) {
if (type & BTRFS_BLOCK_GROUP_SYSTEM) {
@ -1067,22 +1068,19 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
}
if (type & BTRFS_BLOCK_GROUP_RAID1) {
ctl.min_stripes = 2;
ctl.num_stripes = min_t(u64, ctl.min_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.min_stripes, ctl.total_devs);
if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC;
}
if (type & BTRFS_BLOCK_GROUP_RAID1C3) {
ctl.min_stripes = 3;
ctl.num_stripes = min_t(u64, ctl.min_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.min_stripes, ctl.total_devs);
if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC;
}
if (type & BTRFS_BLOCK_GROUP_RAID1C4) {
ctl.min_stripes = 4;
ctl.num_stripes = min_t(u64, ctl.min_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.min_stripes, ctl.total_devs);
if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC;
}
@ -1091,14 +1089,12 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
ctl.min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID0)) {
ctl.num_stripes = min_t(u64, ctl.max_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.max_stripes, ctl.total_devs);
ctl.min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID10)) {
ctl.min_stripes = 4;
ctl.num_stripes = min_t(u64, ctl.max_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.max_stripes, ctl.total_devs);
if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC;
ctl.num_stripes &= ~(u32)1;
@ -1106,8 +1102,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
}
if (type & (BTRFS_BLOCK_GROUP_RAID5)) {
ctl.min_stripes = 2;
ctl.num_stripes = min_t(u64, ctl.max_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.max_stripes, ctl.total_devs);
if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC;
ctl.stripe_len = find_raid56_stripe_len(ctl.num_stripes - 1,
@ -1115,8 +1110,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
}
if (type & (BTRFS_BLOCK_GROUP_RAID6)) {
ctl.min_stripes = 3;
ctl.num_stripes = min_t(u64, ctl.max_stripes,
btrfs_super_num_devices(info->super_copy));
ctl.num_stripes = min(ctl.max_stripes, ctl.total_devs);
if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC;
ctl.stripe_len = find_raid56_stripe_len(ctl.num_stripes - 2,