diff options
| author | Tejun Heo <tj@kernel.org> | 2015-08-18 14:55:33 -0700 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-08 11:08:47 +0800 |
| commit | f69005a79119155eef6707d9a21e4d5182e892e8 (patch) | |
| tree | cb345e789abbb0381728d1a314be083610977091 /block | |
| parent | 98d1c11be2994faa96e338d14186e4afbc4a1fbe (diff) | |
blkcg: misc preparations for unified hierarchy interface
* Export blkg_dev_name()
* Drop unnecessary @cft from __cfq_set_weight().
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit dd165eb3bb4ef16bcdb75417add40633f38c52b8)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 3 | ||||
| -rw-r--r-- | block/cfq-iosched.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 62063dc458d1..a106187b3912 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -465,13 +465,14 @@ static int blkcg_reset_stats(struct cgroup_subsys_state *css, return 0; } -static const char *blkg_dev_name(struct blkcg_gq *blkg) +const char *blkg_dev_name(struct blkcg_gq *blkg) { /* some drivers (floppy) instantiate a queue w/o disk registered */ if (blkg->q->backing_dev_info.dev) return dev_name(blkg->q->backing_dev_info.dev); return NULL; } +EXPORT_SYMBOL_GPL(blkg_dev_name); /** * blkcg_print_blkgs - helper for printing per-blkg data diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ea88d8905bbd..7a7230136e43 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1788,8 +1788,8 @@ static ssize_t cfqg_set_leaf_weight_device(struct kernfs_open_file *of, return __cfqg_set_weight_device(of, buf, nbytes, off, true); } -static int __cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft, - u64 val, bool is_leaf_weight) +static int __cfq_set_weight(struct cgroup_subsys_state *css, u64 val, + bool is_leaf_weight) { struct blkcg *blkcg = css_to_blkcg(css); struct blkcg_gq *blkg; @@ -1834,13 +1834,13 @@ out: static int cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft, u64 val) { - return __cfq_set_weight(css, cft, val, false); + return __cfq_set_weight(css, val, false); } static int cfq_set_leaf_weight(struct cgroup_subsys_state *css, struct cftype *cft, u64 val) { - return __cfq_set_weight(css, cft, val, true); + return __cfq_set_weight(css, val, true); } static int cfqg_print_stat(struct seq_file *sf, void *v) |