Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.
parents f066a4f6 d0e26078

drivers/md/raid1.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -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

				md_error(mddev,

					 conf->mirrors[r1_bio->read_disk].rdev);





			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),