Commit f1c448e0 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: restore ability of spare drives to spin down.
  md/raid6: Fix raid-6 read-error correction in degraded state
parents 2c32b1da 1176568d

drivers/md/md.c

+8 −2
Original line number Diff line number Diff line
@@ -2109,12 +2109,18 @@ static void md_update_sb(mddev_t * mddev, int force_change) 
		if (!mddev->in_sync || mddev->recovery_cp != MaxSector) { /* not clean */

			/* .. if the array isn't clean, an 'even' event must also go

			 * to spares. */

			if ((mddev->events&1)==0)

			if ((mddev->events&1)==0) {

				nospares = 0;

				sync_req = 2; /* force a second update to get the

					       * even/odd in sync */

			}

		} else {

			/* otherwise an 'odd' event must go to spares */

			if ((mddev->events&1))

			if ((mddev->events&1)) {

				nospares = 0;

				sync_req = 2; /* force a second update to get the

					       * even/odd in sync */

			}

		}

	}

drivers/md/raid5.c

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ static void raid5_end_read_request(struct bio * bi, int error) 


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

		atomic_inc(&rdev->read_errors);

		if (conf->mddev->degraded)

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

			printk_rl(KERN_WARNING

				  "raid5:%s: read error not correctable "

				  "(sector %llu on %s).\n",