diff options
| author | NeilBrown <neilb@suse.de> | 2012-07-03 15:58:42 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-07-03 15:58:42 +1000 |
| commit | 32644afd8975d19174bcb9ba34687c32dd810a09 (patch) | |
| tree | 10c55615d0edcb34af0dd2b9d1cdf09cbf34b45d /drivers/md | |
| parent | fab363b5ff502d1b39ddcfec04271f5858d9f26e (diff) | |
| download | op-kernel-dev-32644afd8975d19174bcb9ba34687c32dd810a09.zip op-kernel-dev-32644afd8975d19174bcb9ba34687c32dd810a09.tar.gz | |
md/raid1: fix bug in read_balance introduced by hot-replace
When we added hot_replace we doubled the number of devices
that could be in a RAID1 array. So we doubled how far read_balance
would search. Unfortunately we didn't double the point at which
it looped back to the beginning - so it effectively loops over
all non-replacement disks twice.
This doesn't cause bad behaviour, but it pointless and means we
never read from replacement devices.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 39b2a8a..34b4665 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -517,8 +517,8 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect int bad_sectors; int disk = start_disk + i; - if (disk >= conf->raid_disks) - disk -= conf->raid_disks; + if (disk >= conf->raid_disks * 2) + disk -= conf->raid_disks * 2; rdev = rcu_dereference(conf->mirrors[disk].rdev); if (r1_bio->bios[disk] == IO_BLOCKED |
