lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 241/346] libnvdimm/label: Return -ENXIO for no slot in __blk_label_update
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 4c46764733c85b82c07e9559b39da4d00a7dd659 ]

    Forget to set error code when nd_label_alloc_slot failed, and we
    add it to avoid overwritten error code.

    Fixes: 0ba1c634892b ("libnvdimm: write blk label set")
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Link: https://lore.kernel.org/r/20201205115056.2076523-1-zhangqilong3@huawei.com
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvdimm/label.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
    index 9f1b7e3153f99..df9ca82f459ba 100644
    --- a/drivers/nvdimm/label.c
    +++ b/drivers/nvdimm/label.c
    @@ -880,8 +880,10 @@ static int __blk_label_update(struct nd_region *nd_region,
    if (is_old_resource(res, old_res_list, old_num_resources))
    continue; /* carry-over */
    slot = nd_label_alloc_slot(ndd);
    - if (slot == UINT_MAX)
    + if (slot == UINT_MAX) {
    + rc = -ENXIO;
    goto abort;
    + }
    dev_dbg(ndd->dev, "allocated: %d\n", slot);

    nd_label = to_label(ndd, slot);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:35    [W:3.487 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site