Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

blkcg: cosmetic updates to blkg_create()

Browse source 
* 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>
This commit is contained in:
Tejun Heo 2013-01-09 08:05:10 -08:00
parent 86cde6b623
commit 93e6d5d8f5
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
block/blk-cgroup.c
View file

@ -187,16 +187,16 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
/* blkg holds a reference to blkcg */ /* blkg holds a reference to blkcg */
if (!css_tryget(&blkcg->css)) { if (!css_tryget(&blkcg->css)) {
blkg = ERR_PTR(-EINVAL); ret = -EINVAL;
goto out_free; goto err_free_blkg;
} }
/* allocate */ /* allocate */
if (!new_blkg) { if (!new_blkg) {
new_blkg = blkg_alloc(blkcg, q, GFP_ATOMIC); new_blkg = blkg_alloc(blkcg, q, GFP_ATOMIC);
if (unlikely(!new_blkg)) { if (unlikely(!new_blkg)) {
blkg = ERR_PTR(-ENOMEM); ret = -ENOMEM;
goto out_put; goto err_put_css;
} }
} }
blkg = new_blkg; blkg = new_blkg;
@ -213,12 +213,11 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
if (!ret) if (!ret)
return blkg; return blkg;
blkg = ERR_PTR(ret); err_put_css:
out_put:
css_put(&blkcg->css); css_put(&blkcg->css);
out_free: err_free_blkg:
blkg_free(new_blkg); blkg_free(new_blkg);
return blkg; return ERR_PTR(ret);
} }
/** /**