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

Merge tag 'dm-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm 

Pull device mapper fixes from Mike Snitzer:

 - a dm-raid stable@ fix for possible corruption when triggering a raid
   reshape via lvm2; and an additional small patch ontop to bump version
   of the dm-raid target outside of the stable@ fix

 - a dm-raid fix for a 'dm-4.11-changes' regression introduced by a
   commit that was meant to only cleanup confusing branching.

* tag 'dm-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm raid: bump the target version
  dm raid: fix data corruption on reshape request
  dm raid: fix raid "check" regression due to improper cleanup in raid_message()
parents 54d7989f 2664f3c9

drivers/md/dm-raid.c

+16 −4
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ struct raid_dev { 
#define CTR_FLAG_RAID10_USE_NEAR_SETS	(1 << __CTR_FLAG_RAID10_USE_NEAR_SETS)

#define CTR_FLAG_JOURNAL_DEV		(1 << __CTR_FLAG_JOURNAL_DEV)



#define RESUME_STAY_FROZEN_FLAGS (CTR_FLAG_DELTA_DISKS | CTR_FLAG_DATA_OFFSET)



/*

 * Definitions of various constructor flags to

 * be used in checks of valid / invalid flags
@@ -3462,9 +3464,11 @@ static int raid_message(struct dm_target *ti, unsigned int argc, char **argv) 
	else if (!strcasecmp(argv[0], "recover"))

		set_bit(MD_RECOVERY_RECOVER, &mddev->recovery);

	else {

		if (!strcasecmp(argv[0], "check"))

		if (!strcasecmp(argv[0], "check")) {

			set_bit(MD_RECOVERY_CHECK, &mddev->recovery);

		else if (!strcasecmp(argv[0], "repair")) {

			set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);

			set_bit(MD_RECOVERY_SYNC, &mddev->recovery);

		} else if (!strcasecmp(argv[0], "repair")) {

			set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);

			set_bit(MD_RECOVERY_SYNC, &mddev->recovery);

		} else
@@ -3771,6 +3775,14 @@ static void raid_resume(struct dm_target *ti) 
	mddev->ro = 0;

	mddev->in_sync = 0;



	/*

	 * Keep the RAID set frozen if reshape/rebuild flags are set.

	 * The RAID set is unfrozen once the next table load/resume,

	 * which clears the reshape/rebuild flags, occurs.

	 * This ensures that the constructor for the inactive table

	 * retrieves an up-to-date reshape_position.

	 */

	if (!(rs->ctr_flags & RESUME_STAY_FROZEN_FLAGS))

		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);



	if (mddev->suspended)
@@ -3779,7 +3791,7 @@ static void raid_resume(struct dm_target *ti) 


static struct target_type raid_target = {

	.name = "raid",

	.version = {1, 10, 0},

	.version = {1, 10, 1},

	.module = THIS_MODULE,

	.ctr = raid_ctr,

	.dtr = raid_dtr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE