RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: simplify arguments of chunk_bytes_by_type() 

Chunk_bytes_by_type() takes type, calc_size, and ctl as arguments. But
the first two can be obtained from the ctl. Let's drop these arguments
for simplicity.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Naohiro Aota 2021-04-06 17:05:53 +09:00 committed by David Sterba
parent 3428487d90
commit a968606632
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel-shared/volumes.c
View File

@ -897,9 +897,11 @@ int btrfs_add_system_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
return 0;
}
static u64 chunk_bytes_by_type(u64 type, u64 calc_size,
struct alloc_chunk_ctl *ctl)
static u64 chunk_bytes_by_type(struct alloc_chunk_ctl *ctl)
{
u64 type = ctl->type;
u64 calc_size = ctl->calc_size;
if (type & (BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP))
return calc_size;
else if (type & (BTRFS_BLOCK_GROUP_RAID1C3 | BTRFS_BLOCK_GROUP_RAID1C4))
@ -1091,9 +1093,7 @@ static void init_alloc_chunk_ctl(struct btrfs_fs_info *info,
static int decide_stripe_size_regular(struct alloc_chunk_ctl *ctl)
{
u64 chunk_size = chunk_bytes_by_type(ctl->type, ctl->calc_size, ctl);
if (chunk_size > ctl->max_chunk_size) {
if (chunk_bytes_by_type(ctl) > ctl->max_chunk_size) {
ctl->calc_size = ctl->max_chunk_size;
ctl->calc_size /= ctl->num_stripes;
ctl->calc_size = round_down(ctl->calc_size, BTRFS_STRIPE_LEN);
@ -1158,7 +1158,7 @@ static int create_chunk(struct btrfs_trans_handle *trans,
}
stripes = &chunk->stripe;
ctl->num_bytes = chunk_bytes_by_type(ctl->type, ctl->calc_size, ctl);
ctl->num_bytes = chunk_bytes_by_type(ctl);
index = 0;
while (index < ctl->num_stripes) {
u64 dev_offset;