tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
md: revert incorrect fix for read error handling in raid1.

Linus Torvalds 0a45281f f066a4f6

+4 -3
+4 -3
drivers/md/raid1.c
··· 1650 1650 r1_bio->sector, 1651 1651 r1_bio->sectors); 1652 1652 unfreeze_array(conf); 1653 - } 1653 + } else 1654 + md_error(mddev, 1655 + conf->mirrors[r1_bio->read_disk].rdev); 1654 1656 1655 1657 bio = r1_bio->bios[r1_bio->read_disk]; 1656 - if ((disk=read_balance(conf, r1_bio)) == -1 || 1657 - disk == r1_bio->read_disk) { 1658 + if ((disk=read_balance(conf, r1_bio)) == -1) { 1658 1659 printk(KERN_ALERT "raid1: %s: unrecoverable I/O" 1659 1660 " read error for block %llu\n", 1660 1661 bdevname(bio->bi_bdev,b),