lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 124/135] dm linear: fix linear_end_io conditional definition
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Damien Le Moal <damien.lemoal@wdc.com>

    commit 118aa47c7072bce05fc39bd40a1c0a90caed72ab 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: beb9caac211c1 ("dm linear: eliminate linear_end_io call if CONFIG_DM_ZONED disabled")
    Fixes: 0be12c1c7fce7 ("dm linear: add support for zoned block devices")
    Cc: stable@vger.kernel.org
    Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/md/dm-flakey.c | 2 ++
    drivers/md/dm-linear.c | 4 ++--
    2 files changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/md/dm-flakey.c
    +++ b/drivers/md/dm-flakey.c
    @@ -467,7 +467,9 @@ static int flakey_iterate_devices(struct
    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,
    --- a/drivers/md/dm-linear.c
    +++ b/drivers/md/dm-linear.c
    @@ -102,7 +102,7 @@ static int linear_map(struct dm_target *
    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(st
    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

    \
     
     \ /
      Last update: 2018-10-16 19:17    [W:3.281 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site