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

Commit c339fab1 authored by Damien Le Moal's avatar Damien Le Moal Committed by Greg Kroah-Hartman
Browse files

dm linear: fix linear_end_io conditional definition 



commit 118aa47c upstream.

The dm-linear target is independent of the dm-zoned target. For code
requiring support for zoned block devices, use CONFIG_BLK_DEV_ZONED
instead of CONFIG_DM_ZONED.

While at it, similarly to dm linear, also enable the DM_TARGET_ZONED_HM
feature in dm-flakey only if CONFIG_BLK_DEV_ZONED is defined.

Fixes: beb9caac ("dm linear: eliminate linear_end_io call if CONFIG_DM_ZONED disabled")
Fixes: 0be12c1c ("dm linear: add support for zoned block devices")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efd65379

drivers/md/dm-flakey.c

+2 −0
Original line number Diff line number Diff line
@@ -463,7 +463,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
@@ -101,7 +101,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)

{
@@ -189,7 +189,7 @@ static size_t linear_dax_copy_from_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