Commit b5a9adcb authored by Waiman Long's avatar Waiman Long Committed by Jens Axboe
Browse files

blk-cgroup: Return -ENOMEM directly in blkcg_css_alloc() error path 



For blkcg_css_alloc(), the only error that will be returned is -ENOMEM.
Simplify error handling code by returning this error directly instead
of setting an intermediate "ret" variable.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20221105005902.407297-2-longman@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 077a4033

block/blk-cgroup.c

+4 −8
Original line number Diff line number Diff line
@@ -1139,7 +1139,6 @@ static struct cgroup_subsys_state * 
blkcg_css_alloc(struct cgroup_subsys_state *parent_css)

{

	struct blkcg *blkcg;

	struct cgroup_subsys_state *ret;

	int i;



	mutex_lock(&blkcg_pol_mutex);
@@ -1148,11 +1147,9 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) 
		blkcg = &blkcg_root;

	} else {

		blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);

		if (!blkcg) {

			ret = ERR_PTR(-ENOMEM);

		if (!blkcg)

			goto unlock;

	}

	}



	for (i = 0; i < BLKCG_MAX_POLS ; i++) {

		struct blkcg_policy *pol = blkcg_policy[i];
@@ -1168,10 +1165,9 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) 
			continue;



		cpd = pol->cpd_alloc_fn(GFP_KERNEL);

		if (!cpd) {

			ret = ERR_PTR(-ENOMEM);

		if (!cpd)

			goto free_pd_blkcg;

		}



		blkcg->cpd[i] = cpd;

		cpd->blkcg = blkcg;

		cpd->plid = i;
@@ -1200,7 +1196,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) 
		kfree(blkcg);

unlock:

	mutex_unlock(&blkcg_pol_mutex);

	return ret;

	return ERR_PTR(-ENOMEM);

}



static int blkcg_css_online(struct cgroup_subsys_state *css)