lkml.org 
[lkml]   [2021]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/6] loop: add error handling support for add_disk()
    Date
    We never checked for errors on add_disk() as this function
    returned void. Now that this is fixed, use the shiny new
    error handling.

    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
    ---
    drivers/block/loop.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/block/loop.c b/drivers/block/loop.c
    index fa1c298a8cfb..b8b9e2349e77 100644
    --- a/drivers/block/loop.c
    +++ b/drivers/block/loop.c
    @@ -2393,10 +2393,17 @@ static int loop_add(int i)
    disk->events = DISK_EVENT_MEDIA_CHANGE;
    disk->event_flags = DISK_EVENT_FLAG_UEVENT;
    sprintf(disk->disk_name, "loop%d", i);
    - add_disk(disk);
    +
    + err = add_disk(disk);
    + if (err)
    + goto out_cleanup_disk;
    +
    mutex_unlock(&loop_ctl_mutex);
    +
    return i;

    +out_cleanup_disk:
    + blk_cleanup_disk(disk);
    out_cleanup_tags:
    blk_mq_free_tag_set(&lo->tag_set);
    out_free_idr:
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-27 21:06    [W:3.403 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site