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

btrfs-progs: fix uninitialized number count in chunk-recover 

When count the number of unordered device extents in chunk-recover,
the counter should be reinitialized to be used.
Also, introduce a new function for the counting job.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Gui Hecheng 2014-05-28 18:49:37 +08:00 committed by David Sterba
parent 96ec888aad
commit ae5c13934e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chunk-recover.c
View File

@ -1774,6 +1774,17 @@ static int insert_stripe(struct list_head *devexts,
return 0; return 0;
} }
static inline int count_devext_records(struct list_head *record_list)
{
int num_of_records = 0;
struct device_extent_record *devext;
list_for_each_entry(devext, record_list, chunk_list)
num_of_records++;
return num_of_records;
}
#define EQUAL_STRIPE (1 << 0) #define EQUAL_STRIPE (1 << 0)
static int rebuild_raid_data_chunk_stripes(struct recover_control *rc, static int rebuild_raid_data_chunk_stripes(struct recover_control *rc,
@ -1877,8 +1888,7 @@ next_csum:
fprintf(stderr, "Fetch csum failed\n"); fprintf(stderr, "Fetch csum failed\n");
goto fail_out; goto fail_out;
} else if (ret == 1) { } else if (ret == 1) {
list_for_each_entry(devext, &unordered, chunk_list) num_unordered = count_devext_records(&unordered);
num_unordered++;
if (!(*flags & EQUAL_STRIPE)) if (!(*flags & EQUAL_STRIPE))
*flags |= EQUAL_STRIPE; *flags |= EQUAL_STRIPE;
goto out; goto out;
@ -1906,8 +1916,7 @@ next_csum:
} }
if (list_empty(&candidates)) { if (list_empty(&candidates)) {
list_for_each_entry(devext, &unordered, chunk_list) num_unordered = count_devext_records(&unordered);
num_unordered++;
if (chunk->type_flags & BTRFS_BLOCK_GROUP_RAID6 if (chunk->type_flags & BTRFS_BLOCK_GROUP_RAID6
&& num_unordered == 2) { && num_unordered == 2) {
list_splice_init(&unordered, &chunk->dextents); list_splice_init(&unordered, &chunk->dextents);
@ -1942,8 +1951,7 @@ next_stripe:
out: out:
ret = 0; ret = 0;
list_splice_init(&candidates, &unordered); list_splice_init(&candidates, &unordered);
list_for_each_entry(devext, &unordered, chunk_list) num_unordered = count_devext_records(&unordered);
num_unordered++;
if (num_unordered == 1) { if (num_unordered == 1) {
for (i = 0; i < chunk->num_stripes; i++) { for (i = 0; i < chunk->num_stripes; i++) {
if (!chunk->stripes[i].devid) { if (!chunk->stripes[i].devid) {