lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 156/178] nullb: fix error return code in null_init()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Wei Yongjun <weiyongjun1@huawei.com>


    [ Upstream commit 30c516d750396c5f3ec9cb04c9e025c25e91495e ]

    Fix to return error code -ENOMEM from the null_alloc_dev() error
    handling case instead of 0, as done elsewhere in this function.

    Fixes: 2984c8684f96 ("nullb: factor disk parameters")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/block/null_blk.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/block/null_blk.c
    +++ b/drivers/block/null_blk.c
    @@ -1985,8 +1985,10 @@ static int __init null_init(void)

    for (i = 0; i < nr_devices; i++) {
    dev = null_alloc_dev();
    - if (!dev)
    + if (!dev) {
    + ret = -ENOMEM;
    goto err_dev;
    + }
    ret = null_add_dev(dev);
    if (ret) {
    null_free_dev(dev);

    \
     
     \ /
      Last update: 2017-12-18 17:23    [W:2.549 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site