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

Commit c086ae4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'md-3.3-fixes' of git://neil.brown.name/md 

Two bugfixes for md.

One is a recently introduced regression that affects an unusual
configuration with a guaranteed BUG_ON.  Has been tagged for -stable.
The other is minor missing functionality.

* tag 'md-3.3-fixes' of git://neil.brown.name/md:
  md/raid1: perform bad-block tests for WriteMostly devices too.
  md: notify the 'degraded' sysfs attribute on failure.
parents 7b67e751 307729c8

drivers/md/md.c

+6 −0
Original line number Diff line number Diff line
@@ -7382,6 +7382,7 @@ static int remove_and_add_spares(struct mddev *mddev) 
{

	struct md_rdev *rdev;

	int spares = 0;

	int removed = 0;



	mddev->curr_resync_completed = 0;
@@ -7395,8 +7396,13 @@ static int remove_and_add_spares(struct mddev *mddev) 
				    mddev, rdev) == 0) {

				sysfs_unlink_rdev(mddev, rdev);

				rdev->raid_disk = -1;

				removed++;

			}

		}

	if (removed)

		sysfs_notify(&mddev->kobj, NULL,

			     "degraded");





	list_for_each_entry(rdev, &mddev->disks, same_set) {

		if (rdev->raid_disk >= 0 &&

drivers/md/raid1.c

+10 −1
Original line number Diff line number Diff line
@@ -531,8 +531,17 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect 
		if (test_bit(WriteMostly, &rdev->flags)) {

			/* Don't balance among write-mostly, just

			 * use the first as a last resort */

			if (best_disk < 0)

			if (best_disk < 0) {

				if (is_badblock(rdev, this_sector, sectors,

						&first_bad, &bad_sectors)) {

					if (first_bad < this_sector)

						/* Cannot use this */

						continue;

					best_good_sectors = first_bad - this_sector;

				} else

					best_good_sectors = sectors;

				best_disk = disk;

			}

			continue;

		}

		/* This is a reasonable device to use.  It might