Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93e6d5d8 authored by Tejun Heo's avatar Tejun Heo
Browse files

blkcg: cosmetic updates to blkg_create() 



* 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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
parent 86cde6b6

block/blk-cgroup.c

+7 −8
Original line number Diff line number Diff line
@@ -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);

}



/**