From: Yu Kuai No functional changes are intended, make code cleaner. Signed-off-by: Yu Kuai --- block/blk-iolatency.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index ce25fbb8aaf6..1199447a2a33 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -768,7 +768,7 @@ static int blk_iolatency_init(struct gendisk *disk) &blkcg_iolatency_ops); if (ret) goto err_free; - ret = blkcg_activate_policy(disk, &blkcg_policy_iolatency); + ret = __blkcg_activate_policy(disk, &blkcg_policy_iolatency); if (ret) goto err_qos_del; @@ -837,10 +837,9 @@ static ssize_t iolatency_set_limit(struct kernfs_open_file *of, char *buf, int ret; blkg_conf_init(&ctx, buf); - - ret = blkg_conf_open_bdev(&ctx); + ret = blkg_conf_start(blkcg, &ctx); if (ret) - goto out; + return ret; /* * blk_iolatency_init() may fail after rq_qos_add() succeeds which can @@ -852,10 +851,6 @@ static ssize_t iolatency_set_limit(struct kernfs_open_file *of, char *buf, if (ret) goto out; - ret = blkg_conf_prep(blkcg, &blkcg_policy_iolatency, &ctx); - if (ret) - goto out; - iolat = blkg_to_lat(ctx.blkg); p = ctx.body; @@ -890,7 +885,7 @@ static ssize_t iolatency_set_limit(struct kernfs_open_file *of, char *buf, iolatency_clear_scaling(blkg); ret = 0; out: - blkg_conf_exit(&ctx); + blkg_conf_end(&ctx); return ret ?: nbytes; } -- 2.51.0