diff options
| author | Tejun Heo <tj@kernel.org> | 2015-08-18 23:55:27 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-08-19 00:49:18 +0200 |
| commit | 5332dfc36483d2373d980526145789a354af2d49 (patch) | |
| tree | 8e651633e054aa973eefec787b73ced5013ec107 /block/cfq-iosched.c | |
| parent | blkcg: reduce stack usage of blkg_rwstat_recursive_sum() (diff) | |
| download | linux-5332dfc36483d2373d980526145789a354af2d49.tar.xz linux-5332dfc36483d2373d980526145789a354af2d49.zip | |
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: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 395476ab14fe..bcf40266bd0a 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -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; } |