lkml.org 
[lkml]   [2016]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 06/16] md/bitmap: Return directly after a failed kzalloc() in bitmap_resize()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Tue, 27 Sep 2016 15:21:23 +0200

    * Return directly after a call of the function "kzalloc" failed here.

    * Delete two assignments for the local variable "ret" and the jump
    target "err" which became unnecessary with this refactoring.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/md/bitmap.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
    index 5092bc0..2d30c83 100644
    --- a/drivers/md/bitmap.c
    +++ b/drivers/md/bitmap.c
    @@ -2037,10 +2037,9 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
    pages = DIV_ROUND_UP(chunks, PAGE_COUNTER_RATIO);

    new_bp = kzalloc(pages * sizeof(*new_bp), GFP_KERNEL);
    - ret = -ENOMEM;
    if (!new_bp) {
    bitmap_file_unmap(&store);
    - goto err;
    + return -ENOMEM;
    }

    if (!init)
    @@ -2160,8 +2159,6 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
    bitmap_unplug(bitmap);
    bitmap->mddev->pers->quiesce(bitmap->mddev, 0);
    }
    - ret = 0;
    -err:
    return ret;
    }
    EXPORT_SYMBOL_GPL(bitmap_resize);
    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-27 18:54    [W:4.638 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site