dm raid: bump the target version (2664f3c9) · Commits · 戴 / test

This version bump reflects that the reshape corruption fix (commit 92a39f6cc "dm raid: fix data corruption on reshape request") is present. Done as a separate fix because the above referenced commit is marked for stable and target version bumps in a stable@ fix are a recipe for the fix to never get backported to stable@ kernels (because of target version number conflicts). Also, move RESUME_STAY_FROZEN_FLAGS up with the reset the the _FLAGS definitions now that we don't need to worry about stable@ conflicts as a result of missing context. Signed-off-by:

Mike Snitzer <snitzer@redhat.com>

drivers/md/dm-raid.c

+3 −3

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
		@@ -3756,8 +3758,6 @@ static int raid_preresume(struct dm_target *ti)
		return r;
		}

		#define RESUME_STAY_FROZEN_FLAGS (CTR_FLAG_DELTA_DISKS \| CTR_FLAG_DATA_OFFSET)

		static void raid_resume(struct dm_target *ti)
		{
		struct raid_set *rs = ti->private;
		@@ -3791,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,

Admin message