Commit 0a45281f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  md: revert incorrect fix for read error handling in raid1.
parents f066a4f6 d0e26078
...@@ -1650,11 +1650,12 @@ static void raid1d(mddev_t *mddev) ...@@ -1650,11 +1650,12 @@ static void raid1d(mddev_t *mddev)
r1_bio->sector, r1_bio->sector,
r1_bio->sectors); r1_bio->sectors);
unfreeze_array(conf); unfreeze_array(conf);
} } else
bio = r1_bio->bios[r1_bio->read_disk]; bio = r1_bio->bios[r1_bio->read_disk];
if ((disk=read_balance(conf, r1_bio)) == -1 || if ((disk=read_balance(conf, r1_bio)) == -1) {
disk == r1_bio->read_disk) {
printk(KERN_ALERT "raid1: %s: unrecoverable I/O" printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
" read error for block %llu\n", " read error for block %llu\n",
bdevname(bio->bi_bdev,b), bdevname(bio->bi_bdev,b),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment