lkml.org 
[lkml]   [2012]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/12] blkcg: cosmetic updates to blkg_create()
    Date
    * Rename out_* labels to err_*.

    * Do ERR_PTR() conversion once in the error return path.

    This patch is cosmetic and to prepare for the hierarchy support.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    ---
    block/blk-cgroup.c | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
    index ffbd237..fde2286 100644
    --- a/block/blk-cgroup.c
    +++ b/block/blk-cgroup.c
    @@ -187,16 +187,16 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,

    /* blkg holds a reference to blkcg */
    if (!css_tryget(&blkcg->css)) {
    - blkg = ERR_PTR(-EINVAL);
    - goto out_free;
    + ret = -EINVAL;
    + goto err_free_blkg;
    }

    /* allocate */
    if (!new_blkg) {
    new_blkg = blkg_alloc(blkcg, q, GFP_ATOMIC);
    if (unlikely(!new_blkg)) {
    - blkg = ERR_PTR(-ENOMEM);
    - goto out_put;
    + ret = -ENOMEM;
    + goto err_put_css;
    }
    }
    blkg = new_blkg;
    @@ -213,12 +213,11 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
    if (!ret)
    return blkg;

    - blkg = ERR_PTR(ret);
    -out_put:
    +err_put_css:
    css_put(&blkcg->css);
    -out_free:
    +err_free_blkg:
    blkg_free(new_blkg);
    - return blkg;
    + return ERR_PTR(ret);
    }

    /**
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2012-12-15 01:21    [W:2.494 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site