diff options
| author | Gui Hecheng <guihc.fnst@cn.fujitsu.com> | 2014-05-28 18:49:37 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-08-22 14:39:33 +0200 |
| commit | ae5c13934e1d93dd000314af5be64e58c00ff716 (patch) | |
| tree | 29014a94859e73226103b0314bb3adf72224b7ab /chunk-recover.c | |
| parent | 96ec888aad41969d728ba62c1778d6e8ebe6bd4e (diff) | |
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>
Diffstat (limited to 'chunk-recover.c')
| -rw-r--r-- | chunk-recover.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/chunk-recover.c b/chunk-recover.c index 613d7152..bd37d6e8 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -1774,6 +1774,17 @@ static int insert_stripe(struct list_head *devexts, 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) static int rebuild_raid_data_chunk_stripes(struct recover_control *rc, @@ -1877,8 +1888,7 @@ next_csum: fprintf(stderr, "Fetch csum failed\n"); goto fail_out; } else if (ret == 1) { - list_for_each_entry(devext, &unordered, chunk_list) - num_unordered++; + num_unordered = count_devext_records(&unordered); if (!(*flags & EQUAL_STRIPE)) *flags |= EQUAL_STRIPE; goto out; @@ -1906,8 +1916,7 @@ next_csum: } if (list_empty(&candidates)) { - list_for_each_entry(devext, &unordered, chunk_list) - num_unordered++; + num_unordered = count_devext_records(&unordered); if (chunk->type_flags & BTRFS_BLOCK_GROUP_RAID6 && num_unordered == 2) { list_splice_init(&unordered, &chunk->dextents); @@ -1942,8 +1951,7 @@ next_stripe: out: ret = 0; list_splice_init(&candidates, &unordered); - list_for_each_entry(devext, &unordered, chunk_list) - num_unordered++; + num_unordered = count_devext_records(&unordered); if (num_unordered == 1) { for (i = 0; i < chunk->num_stripes; i++) { if (!chunk->stripes[i].devid) { |