summaryrefslogtreecommitdiff
path: root/chunk-recover.c
diff options
context:
space:
mode:
authorAnand Jain <Anand.Jain@oracle.com>2014-10-07 06:27:16 +0800
committerDavid Sterba <dsterba@suse.cz>2014-10-14 11:20:09 +0200
commit7fd6d933528f30ab03d3880c8cb5e89968e41858 (patch)
tree8edb31a94fc1e3db34a66aae423ceaee895b529e /chunk-recover.c
parente3966ec9d099c0e8ac7261a62720528ef901f182 (diff)
downloadbtrfs-progs-7fd6d933528f30ab03d3880c8cb5e89968e41858.tar.gz
btrfs-progs: fix uninitialized warning in btrfs_calc_stripe_index
chunk-recover.c: In function btrfs_calc_stripe_index chunk-recover.c:1481: warning: index may be used uninitialized in this function Signed-off-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'chunk-recover.c')
-rw-r--r--chunk-recover.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/chunk-recover.c b/chunk-recover.c
index aa38916..677b6c2 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1491,7 +1491,7 @@ static int btrfs_calc_stripe_index(struct chunk_record *chunk, u64 logical)
stripe_nr /= nr_data_stripes;
index = (index + stripe_nr) % chunk->num_stripes;
} else {
- BUG_ON(1);
+ return -1;
}
return index;
}
@@ -1554,6 +1554,7 @@ btrfs_rebuild_ordered_meta_chunk_stripes(struct recover_control *rc,
again:
er = container_of(cache, struct extent_record, cache);
index = btrfs_calc_stripe_index(chunk, er->cache.start);
+ BUG_ON(index == -1);
if (chunk->stripes[index].devid)
goto next;
list_for_each_entry_safe(devext, next, &devexts, chunk_list) {
@@ -1944,6 +1945,7 @@ next_csum:
if (list_is_last(candidates.next, &candidates)) {
index = btrfs_calc_stripe_index(chunk,
key.offset + csum_offset * blocksize);
+ BUG_ON(index == -1);
if (chunk->stripes[index].devid)
goto next_stripe;
ret = insert_stripe(&candidates, rc, chunk, index);