GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

blkcg: misc preparations for unified hierarchy interface

Browse source 
* 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>
This commit is contained in:
Tejun Heo 2015-08-18 14:55:33 -07:00 • committed by Jens Axboe
parent 69948b070e
commit dd165eb3bb
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
block/blk-cgroup.c
View file

@ -462,13 +462,14 @@ static int blkcg_reset_stats(struct cgroup_subsys_state *css,
return 0; 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 */ /* some drivers (floppy) instantiate a queue w/o disk registered */
if (blkg->q->backing_dev_info.dev) if (blkg->q->backing_dev_info.dev)
return dev_name(blkg->q->backing_dev_info.dev); return dev_name(blkg->q->backing_dev_info.dev);
return NULL; return NULL;
} }
EXPORT_SYMBOL_GPL(blkg_dev_name);
/** /**
* blkcg_print_blkgs - helper for printing per-blkg data * blkcg_print_blkgs - helper for printing per-blkg data

8
block/cfq-iosched.c
View file

@ -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); return __cfqg_set_weight_device(of, buf, nbytes, off, true);
} }
static int __cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft, static int __cfq_set_weight(struct cgroup_subsys_state *css, u64 val,
u64 val, bool is_leaf_weight) bool is_leaf_weight)
{ {
struct blkcg *blkcg = css_to_blkcg(css); struct blkcg *blkcg = css_to_blkcg(css);
struct blkcg_gq *blkg; struct blkcg_gq *blkg;
@ -1834,13 +1834,13 @@ out:
static int cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft, static int cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft,
u64 val) 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, static int cfq_set_leaf_weight(struct cgroup_subsys_state *css,
struct cftype *cft, u64 val) 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) static int cfqg_print_stat(struct seq_file *sf, void *v)

1
include/linux/blk-cgroup.h
View file

@ -182,6 +182,7 @@ int blkcg_activate_policy(struct request_queue *q,
void blkcg_deactivate_policy(struct request_queue *q, void blkcg_deactivate_policy(struct request_queue *q,
const struct blkcg_policy *pol); const struct blkcg_policy *pol);
const char *blkg_dev_name(struct blkcg_gq *blkg);
void blkcg_print_blkgs(struct seq_file *sf, struct blkcg *blkcg, void blkcg_print_blkgs(struct seq_file *sf, struct blkcg *blkcg,
u64 (*prfill)(struct seq_file *, u64 (*prfill)(struct seq_file *,
struct blkg_policy_data *, int), struct blkg_policy_data *, int),