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

Commit 9dcd936c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-4.19/dm-fixes-4' of... 

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

Mike writes:
  "device mapper fix for 4.19 final

   - Fix for earlier 4.19 final DM linear change that incorrectly
     checked for CONFIG_DM_ZONED rather than CONFIG_BLK_DEV_ZONED."

* tag 'for-4.19/dm-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm linear: fix linear_end_io conditional definition
parents 4718dcad 118aa47c

drivers/md/dm-flakey.c

+2 −0
Original line number Diff line number Diff line
@@ -467,7 +467,9 @@ static int flakey_iterate_devices(struct dm_target *ti, iterate_devices_callout_ 
static struct target_type flakey_target = {

	.name   = "flakey",

	.version = {1, 5, 0},

#ifdef CONFIG_BLK_DEV_ZONED

	.features = DM_TARGET_ZONED_HM,

#endif

	.module = THIS_MODULE,

	.ctr    = flakey_ctr,

	.dtr    = flakey_dtr,

drivers/md/dm-linear.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int linear_map(struct dm_target *ti, struct bio *bio) 
	return DM_MAPIO_REMAPPED;

}



#ifdef CONFIG_DM_ZONED

#ifdef CONFIG_BLK_DEV_ZONED

static int linear_end_io(struct dm_target *ti, struct bio *bio,

			 blk_status_t *error)

{
@@ -210,7 +210,7 @@ static size_t linear_dax_copy_to_iter(struct dm_target *ti, pgoff_t pgoff, 
static struct target_type linear_target = {

	.name   = "linear",

	.version = {1, 4, 0},

#ifdef CONFIG_DM_ZONED

#ifdef CONFIG_BLK_DEV_ZONED

	.end_io = linear_end_io,

	.features = DM_TARGET_PASSES_INTEGRITY | DM_TARGET_ZONED_HM,

#else