dm raid: fix use of wrong status char during resynchronization

mauelsha · snitm · commit 2a034ec197aa · 2016-08-04T10:05:30.000-04:00
During a resynchronization, device status char 'a' is output on the raid
status line for every device of a RAID set.  It changes from 'a' to 'A'
(unless device failure) when the resynchronization completes.

Interrupting and restarting a resynchronization, by reloading the DM
table, erroneously lead to status char 'A'.

Fix this by avoiding setting the MD_RECOVERY_REQUESTED flag in
raid_preresume().

Signed-off-by: Heinz Mauelshagen &lt;heinzm@redhat.com&gt;
Signed-off-by: Mike Snitzer &lt;snitzer@redhat.com&gt;
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
@@ -3578,7 +3578,6 @@ static int raid_preresume(struct dm_target *ti)
 	/* Be prepared for mddev_resume() in raid_resume() */
 	set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
 	if (mddev->recovery_cp && mddev->recovery_cp < MaxSector) {
-		set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
 		set_bit(MD_RECOVERY_SYNC, &mddev->recovery);
 		mddev->resync_min = mddev->recovery_cp;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3578,7 +3578,6 @@ static int raid_preresume(struct dm_target *ti)`
`3578`	`3578`	`/* Be prepared for mddev_resume() in raid_resume() */`
`3579`	`3579`	`set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);`
`3580`	`3580`	`if (mddev->recovery_cp && mddev->recovery_cp < MaxSector) {`
`3581`		`- set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);`
`3582`	`3581`	`set_bit(MD_RECOVERY_SYNC, &mddev->recovery);`
`3583`	`3582`	`mddev->resync_min = mddev->recovery_cp;`
`3584`	`3583`	`}`