leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: refactor block group replication factor calculation to a helper

Browse Source 
There are many places that open code the duplicity factor of the block
group profiles, create a common helper. This can be easily extended for
more copies.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-07-13 20:46:30 +02:00
parent 321a4bf72b
commit 46df06b85e
4 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/btrfs/extent-tree.c
View File

@ -3931,11 +3931,7 @@ static void update_space_info(struct btrfs_fs_info *info, u64 flags,
struct btrfs_space_info *found; struct btrfs_space_info *found;
int factor; int factor;
if (flags & (BTRFS_BLOCK_GROUP_DUP | BTRFS_BLOCK_GROUP_RAID1 | factor = btrfs_bg_type_to_factor(flags);
BTRFS_BLOCK_GROUP_RAID10))
factor = 2;
else
factor = 1;
found = __find_space_info(info, flags); found = __find_space_info(info, flags);
ASSERT(found); ASSERT(found);
@ -4576,6 +4572,7 @@ static int can_overcommit(struct btrfs_fs_info *fs_info,
u64 space_size; u64 space_size;
u64 avail; u64 avail;
u64 used; u64 used;
int factor;
/* Don't overcommit when in mixed mode. */ /* Don't overcommit when in mixed mode. */
if (space_info->flags & BTRFS_BLOCK_GROUP_DATA) if (space_info->flags & BTRFS_BLOCK_GROUP_DATA)
@ -4610,10 +4607,8 @@ static int can_overcommit(struct btrfs_fs_info *fs_info,
* doesn't include the parity drive, so we don't have to * doesn't include the parity drive, so we don't have to
* change the math * change the math
*/ */
if (profile & (BTRFS_BLOCK_GROUP_DUP | factor = btrfs_bg_type_to_factor(profile);
BTRFS_BLOCK_GROUP_RAID1 | avail = div_u64(avail, factor);
BTRFS_BLOCK_GROUP_RAID10))
avail >>= 1;
/* /*
* If we aren't flushing all things, let us overcommit up to * If we aren't flushing all things, let us overcommit up to
@ -6094,12 +6089,8 @@ static int update_block_group(struct btrfs_trans_handle *trans,
cache = btrfs_lookup_block_group(info, bytenr); cache = btrfs_lookup_block_group(info, bytenr);
if (!cache) if (!cache)
return -ENOENT; return -ENOENT;
if (cache->flags & (BTRFS_BLOCK_GROUP_DUP | factor = btrfs_bg_type_to_factor(cache->flags);
BTRFS_BLOCK_GROUP_RAID1 |
BTRFS_BLOCK_GROUP_RAID10))
factor = 2;
else
factor = 1;
/* /*
* If this block group has free space cache written out, we * If this block group has free space cache written out, we
* need to make sure to load it if we are removing space. This * need to make sure to load it if we are removing space. This
@ -9359,13 +9350,7 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)
continue; continue;
} }
if (block_group->flags & (BTRFS_BLOCK_GROUP_RAID1 | factor = btrfs_bg_type_to_factor(block_group->flags);
BTRFS_BLOCK_GROUP_RAID10 |
BTRFS_BLOCK_GROUP_DUP))
factor = 2;
else
factor = 1;
free_bytes += (block_group->key.offset - free_bytes += (block_group->key.offset -
btrfs_block_group_used(&block_group->item)) * btrfs_block_group_used(&block_group->item)) *
factor; factor;
@ -10175,12 +10160,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
memcpy(&key, &block_group->key, sizeof(key)); memcpy(&key, &block_group->key, sizeof(key));
index = btrfs_bg_flags_to_raid_index(block_group->flags); index = btrfs_bg_flags_to_raid_index(block_group->flags);
if (block_group->flags & (BTRFS_BLOCK_GROUP_DUP | factor = btrfs_bg_type_to_factor(block_group->flags);
BTRFS_BLOCK_GROUP_RAID1 |
BTRFS_BLOCK_GROUP_RAID10))
factor = 2;
else
factor = 1;
/* make sure this block group isn't part of an allocation cluster */ /* make sure this block group isn't part of an allocation cluster */
cluster = &fs_info->data_alloc_cluster; cluster = &fs_info->data_alloc_cluster;

11
fs/btrfs/super.c
View File

@ -2107,14 +2107,9 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
btrfs_account_ro_block_groups_free_space(found); btrfs_account_ro_block_groups_free_space(found);
for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) { for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) {
if (!list_empty(&found->block_groups[i])) { if (!list_empty(&found->block_groups[i]))
switch (i) { factor = btrfs_bg_type_to_factor(
case BTRFS_RAID_DUP: btrfs_raid_array[i].bg_flag);
case BTRFS_RAID_RAID1:
case BTRFS_RAID_RAID10:
factor = 2;
}
}
} }
} }

11
fs/btrfs/volumes.c
View File

@ -7292,3 +7292,14 @@ void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info)
fs_devices = fs_devices->seed; fs_devices = fs_devices->seed;
} }
} }
/*
* Multiplicity factor for simple profiles: DUP, RAID1-like and RAID10.
*/
int btrfs_bg_type_to_factor(u64 flags)
{
if (flags & (BTRFS_BLOCK_GROUP_DUP | BTRFS_BLOCK_GROUP_RAID1 |
BTRFS_BLOCK_GROUP_RAID10))
return 2;
return 1;
}

2
fs/btrfs/volumes.h
View File

@ -559,4 +559,6 @@ void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info);
bool btrfs_check_rw_degradable(struct btrfs_fs_info *fs_info, bool btrfs_check_rw_degradable(struct btrfs_fs_info *fs_info,
struct btrfs_device *failing_dev); struct btrfs_device *failing_dev);
int btrfs_bg_type_to_factor(u64 flags);
#endif #endif