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

btrfs: simplify data stripe calculation helpers

Browse Source 
There are two helpers doing the same calculations based on nparity and
ncopies. calc_data_stripes can be simplified into one expression, so far
we don't have profile with both copies and parity, so there's no
effective change. calc_stripe_length should reuse the helper and not
repeat the same calculation.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba
2021-07-26 14:15:24 +02:00
parent fe4f46d40c
commit d58ede8d1d
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/btrfs/volumes.c
View File

@@ -3568,10 +3568,7 @@ static u64 calc_data_stripes(u64 type, int num_stripes)
const int ncopies = btrfs_raid_array[index].ncopies; const int ncopies = btrfs_raid_array[index].ncopies;
const int nparity = btrfs_raid_array[index].nparity; const int nparity = btrfs_raid_array[index].nparity;
if (nparity) return (num_stripes - nparity) / ncopies;
return num_stripes - nparity;
else
return num_stripes / ncopies;
} }
/* [pstart, pend) */ /* [pstart, pend) */
@@ -6879,15 +6876,7 @@ static void btrfs_report_missing_device(struct btrfs_fs_info *fs_info,
static u64 calc_stripe_length(u64 type, u64 chunk_len, int num_stripes) static u64 calc_stripe_length(u64 type, u64 chunk_len, int num_stripes)
{ {
int index = btrfs_bg_flags_to_raid_index(type); const int data_stripes = calc_data_stripes(type, num_stripes);
int ncopies = btrfs_raid_array[index].ncopies;
const int nparity = btrfs_raid_array[index].nparity;
int data_stripes;
if (nparity)
data_stripes = num_stripes - nparity;
else
data_stripes = num_stripes / ncopies;
return div_u64(chunk_len, data_stripes); return div_u64(chunk_len, data_stripes);
} }