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

Commit 2e8ac303 authored by majianpeng's avatar majianpeng Committed by NeilBrown
Browse files

md/raid456: When read error cannot be recovered, record bad block 



We may not be able to fix a bad block if:
 - the array is degraded
 - the over-write fails.

In these cases we currently eject the device, but we should
record a bad block if possible.

Signed-off-by: default avatarmajianpeng <majianpeng@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 0232605d

drivers/md/raid5.c

+11 −4
Original line number Diff line number Diff line
@@ -1743,6 +1743,7 @@ static void raid5_end_read_request(struct bio * bi, int error) 
	} else {

		const char *bdn = bdevname(rdev->bdev, b);

		int retry = 0;

		int set_bad = 0;



		clear_bit(R5_UPTODATE, &sh->dev[i].flags);

		atomic_inc(&rdev->read_errors);
@@ -1754,7 +1755,8 @@ static void raid5_end_read_request(struct bio * bi, int error) 
				mdname(conf->mddev),

				(unsigned long long)s,

				bdn);

		else if (conf->mddev->degraded >= conf->max_degraded)

		else if (conf->mddev->degraded >= conf->max_degraded) {

			set_bad = 1;

			printk_ratelimited(

				KERN_WARNING

				"md/raid:%s: read error not correctable "
@@ -1762,8 +1764,9 @@ static void raid5_end_read_request(struct bio * bi, int error) 
				mdname(conf->mddev),

				(unsigned long long)s,

				bdn);

		else if (test_bit(R5_ReWrite, &sh->dev[i].flags))

		} else if (test_bit(R5_ReWrite, &sh->dev[i].flags)) {

			/* Oh, no!!! */

			set_bad = 1;

			printk_ratelimited(

				KERN_WARNING

				"md/raid:%s: read error NOT corrected!! "
@@ -1771,7 +1774,7 @@ static void raid5_end_read_request(struct bio * bi, int error) 
				mdname(conf->mddev),

				(unsigned long long)s,

				bdn);

		else if (atomic_read(&rdev->read_errors)

		} else if (atomic_read(&rdev->read_errors)

			 > conf->max_nr_stripes)

			printk(KERN_WARNING

			       "md/raid:%s: Too many read errors, failing device %s.\n",
@@ -1783,6 +1786,10 @@ static void raid5_end_read_request(struct bio * bi, int error) 
		else {

			clear_bit(R5_ReadError, &sh->dev[i].flags);

			clear_bit(R5_ReWrite, &sh->dev[i].flags);

			if (!(set_bad

			      && test_bit(In_sync, &rdev->flags)

			      && rdev_set_badblocks(

				      rdev, sh->sector, STRIPE_SECTORS, 0)))

				md_error(conf->mddev, rdev);

		}

	}