marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: chunk-recovery: Fix a float point error 

Fix a zero division causing chunk-recovery fail.

Also fix a typo "strpie_length" -> "stripe_length".

Reported-by: Scotty Edmonds <scotty@scottyedmonds.com>
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Qu Wenruo 2015-11-19 14:42:39 +08:00 committed by David Sterba
parent b7a69afe69
commit a99d13dcce
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
btrfsck.h
View File

@ -142,6 +142,23 @@ static inline unsigned long btrfs_chunk_record_size(int num_stripes)
}
void free_chunk_cache_tree(struct cache_tree *chunk_cache);
/*
* Function to check validation for num_stripes, or it can call
* float point error for 0 division
* return < 0 for invalid combination
* return 0 for valid combination
*/
static inline int check_num_stripes(u64 type, int num_stripes)
{
if (num_stripes == 0)
return -1;
if (type & BTRFS_BLOCK_GROUP_RAID5 && num_stripes <= 1)
return -1;
if (type & BTRFS_BLOCK_GROUP_RAID6 && num_stripes <= 2)
return -1;
return 0;
}
u64 calc_stripe_length(u64 type, u64 length, int num_stripes);
/* For block group tree */
static inline void block_group_tree_init(struct block_group_tree *tree)

9
chunk-recover.c
View File

@ -1607,16 +1607,19 @@ static int btrfs_verify_device_extents(struct block_group_record *bg,
struct list_head *devexts, int ndevexts)
{
struct device_extent_record *devext;
u64 strpie_length;
u64 stripe_length;
int expected_num_stripes;
expected_num_stripes = calc_num_stripes(bg->flags);
if (expected_num_stripes && expected_num_stripes != ndevexts)
return 1;
strpie_length = calc_stripe_length(bg->flags, bg->offset, ndevexts);
if (check_num_stripes(bg->flags, ndevexts) < 0)
return 1;
stripe_length = calc_stripe_length(bg->flags, bg->offset, ndevexts);
list_for_each_entry(devext, devexts, chunk_list) {
if (devext->length != strpie_length)
if (devext->length != stripe_length)
return 1;
}
return 0;