Skip to content

Commit

Permalink
blkcg: cosmetic updates to blkg_create()
Browse files Browse the repository at this point in the history
* 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>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
  • Loading branch information
Tejun Heo committed Jan 9, 2013
1 parent 86cde6b commit 93e6d5d
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions block/blk-cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

/**
Expand Down

0 comments on commit 93e6d5d

Please sign in to comment.