lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 252/388] dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone
    Date
    From: Hannes Reinecke <hare@suse.de>

    [ Upstream commit 489dc0f06a5837f87482c0ce61d830d24e17082e ]

    The only case where dmz_get_zone_for_reclaim() cannot return a zone is
    if the respective lists are empty. So we should just return a simple
    NULL value here as we really don't have an error code which would make
    sense.

    Signed-off-by: Hannes Reinecke <hare@suse.de>
    Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/md/dm-zoned-metadata.c | 4 ++--
    drivers/md/dm-zoned-reclaim.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
    index 369de15c4e80..61b7d7b7e5a6 100644
    --- a/drivers/md/dm-zoned-metadata.c
    +++ b/drivers/md/dm-zoned-metadata.c
    @@ -1554,7 +1554,7 @@ static struct dm_zone *dmz_get_rnd_zone_for_reclaim(struct dmz_metadata *zmd)
    return dzone;
    }

    - return ERR_PTR(-EBUSY);
    + return NULL;
    }

    /*
    @@ -1574,7 +1574,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
    return zone;
    }

    - return ERR_PTR(-EBUSY);
    + return NULL;
    }

    /*
    diff --git a/drivers/md/dm-zoned-reclaim.c b/drivers/md/dm-zoned-reclaim.c
    index e7ace908a9b7..d50817320e8e 100644
    --- a/drivers/md/dm-zoned-reclaim.c
    +++ b/drivers/md/dm-zoned-reclaim.c
    @@ -349,8 +349,8 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)

    /* Get a data zone */
    dzone = dmz_get_zone_for_reclaim(zmd);
    - if (IS_ERR(dzone))
    - return PTR_ERR(dzone);
    + if (!dzone)
    + return -EBUSY;

    start = jiffies;

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:34    [W:3.101 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site