Btrfs: fix repair code for RAID10
btrfs_map_block sets mirror_num, so that the repair code knows eventually which device gave us the read error. For RAID10, mirror_num must be 1 or 2. Before this fix mirror_num was incorrectly related to our stripe index. Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net> Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
996d282c7f
commit
3e74317ad7
|
@ -3807,10 +3807,11 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw,
|
||||||
else if (mirror_num)
|
else if (mirror_num)
|
||||||
stripe_index += mirror_num - 1;
|
stripe_index += mirror_num - 1;
|
||||||
else {
|
else {
|
||||||
|
int old_stripe_index = stripe_index;
|
||||||
stripe_index = find_live_mirror(map, stripe_index,
|
stripe_index = find_live_mirror(map, stripe_index,
|
||||||
map->sub_stripes, stripe_index +
|
map->sub_stripes, stripe_index +
|
||||||
current->pid % map->sub_stripes);
|
current->pid % map->sub_stripes);
|
||||||
mirror_num = stripe_index + 1;
|
mirror_num = stripe_index - old_stripe_index + 1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue