diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /drivers/md/raid1.c | |
| parent | 140573d33b703194b7e1893711e78b7f546cca7c (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into sched/core
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 7b4f5f7155d8..01e3cffd03b8 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -1640,7 +1640,8 @@ static void raid1d(mddev_t *mddev) | |||
| 1640 | } | 1640 | } |
| 1641 | 1641 | ||
| 1642 | bio = r1_bio->bios[r1_bio->read_disk]; | 1642 | bio = r1_bio->bios[r1_bio->read_disk]; |
| 1643 | if ((disk=read_balance(conf, r1_bio)) == -1) { | 1643 | if ((disk=read_balance(conf, r1_bio)) == -1 || |
| 1644 | disk == r1_bio->read_disk) { | ||
| 1644 | printk(KERN_ALERT "raid1: %s: unrecoverable I/O" | 1645 | printk(KERN_ALERT "raid1: %s: unrecoverable I/O" |
| 1645 | " read error for block %llu\n", | 1646 | " read error for block %llu\n", |
| 1646 | bdevname(bio->bi_bdev,b), | 1647 | bdevname(bio->bi_bdev,b), |