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

Commit 5332dfc3 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

blkcg: remove unnecessary NULL checks from __cfqg_set_weight_device() 



blkg_to_cfqg() and blkcg_to_cfqgd() on a valid blkg with the policy
enabled are guaranteed to return non-NULL and the counterpart in
blk-throttle doesn't have these checks either.  Remove the spurious
NULL checks.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3a7faead

block/cfq-iosched.c

+1 −4
Original line number Diff line number Diff line
@@ -1752,12 +1752,10 @@ static ssize_t __cfqg_set_weight_device(struct kernfs_open_file *of, 
	if (ret)

		return ret;



	ret = -EINVAL;

	cfqg = blkg_to_cfqg(ctx.blkg);

	cfqgd = blkcg_to_cfqgd(blkcg);

	if (!cfqg || !cfqgd)

		goto err;



	ret = -EINVAL;

	if (!ctx.v || (ctx.v >= CFQ_WEIGHT_MIN && ctx.v <= CFQ_WEIGHT_MAX)) {

		if (!is_leaf_weight) {

			cfqg->dev_weight = ctx.v;
@@ -1769,7 +1767,6 @@ static ssize_t __cfqg_set_weight_device(struct kernfs_open_file *of, 
		ret = 0;

	}



err:

	blkg_conf_finish(&ctx);

	return ret ?: nbytes;

}