diff options
| author | Tejun Heo <tj@kernel.org> | 2015-08-18 23:55:28 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-08-19 00:49:18 +0200 |
| commit | 20386ce0143899ccb5bcbda714436a82d3029f33 (patch) | |
| tree | f1fe9b3a30a3afce0ea20632b830007495d95b0a /block | |
| parent | blkcg: remove unnecessary NULL checks from __cfqg_set_weight_device() (diff) | |
| download | linux-20386ce0143899ccb5bcbda714436a82d3029f33.tar.xz linux-20386ce0143899ccb5bcbda714436a82d3029f33.zip | |
blkcg: refine error codes returned during blkcg configuration
blkcg currently returns -EINVAL for most errors which can be pretty
confusing given that the failure modes are quite varied. Update the
error returns so that
* -EINVAL only for syntactic errors.
* -ERANGE if the value is out of range.
* -ENODEV if the target device can't be found.
* -EOPNOTSUPP if the policy is not enabled on the target device.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 12 | ||||
| -rw-r--r-- | block/cfq-iosched.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index c82c5dbf9187..0af3bff198ed 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -179,7 +179,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, /* blkg holds a reference to blkcg */ if (!css_tryget_online(&blkcg->css)) { - ret = -EINVAL; + ret = -ENODEV; goto err_free_blkg; } @@ -205,7 +205,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, if (blkcg_parent(blkcg)) { blkg->parent = __blkg_lookup(blkcg_parent(blkcg), q, false); if (WARN_ON_ONCE(!blkg->parent)) { - ret = -EINVAL; + ret = -ENODEV; goto err_put_congested; } blkg_get(blkg->parent); @@ -279,7 +279,7 @@ struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg, * we shouldn't allow anything to go through for a bypassing queue. */ if (unlikely(blk_queue_bypass(q))) - return ERR_PTR(blk_queue_dying(q) ? -EINVAL : -EBUSY); + return ERR_PTR(blk_queue_dying(q) ? -ENODEV : -EBUSY); blkg = __blkg_lookup(blkcg, q, true); if (blkg) @@ -792,10 +792,10 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, disk = get_gendisk(MKDEV(major, minor), &part); if (!disk) - return -EINVAL; + return -ENODEV; if (part) { put_disk(disk); - return -EINVAL; + return -ENODEV; } rcu_read_lock(); @@ -804,7 +804,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, if (blkcg_policy_enabled(disk->queue, pol)) blkg = blkg_lookup_create(blkcg, disk->queue); else - blkg = ERR_PTR(-EINVAL); + blkg = ERR_PTR(-EOPNOTSUPP); if (IS_ERR(blkg)) { ret = PTR_ERR(blkg); diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index bcf40266bd0a..38277e3ce286 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1755,7 +1755,7 @@ static ssize_t __cfqg_set_weight_device(struct kernfs_open_file *of, cfqg = blkg_to_cfqg(ctx.blkg); cfqgd = blkcg_to_cfqgd(blkcg); - ret = -EINVAL; + ret = -ERANGE; if (!ctx.v || (ctx.v >= CFQ_WEIGHT_MIN && ctx.v <= CFQ_WEIGHT_MAX)) { if (!is_leaf_weight) { cfqg->dev_weight = ctx.v; |