diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-cgroup.c | 14 | ||||
-rw-r--r-- | block/blk-cgroup.h | 3 | ||||
-rw-r--r-- | block/cfq-iosched.c | 5 |
3 files changed, 0 insertions, 22 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index e7dbbaf5fb3e..c85d74cae200 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -23,20 +23,6 @@ static LIST_HEAD(blkio_list); | |||
23 | struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT }; | 23 | struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT }; |
24 | EXPORT_SYMBOL_GPL(blkio_root_cgroup); | 24 | EXPORT_SYMBOL_GPL(blkio_root_cgroup); |
25 | 25 | ||
26 | bool blkiocg_css_tryget(struct blkio_cgroup *blkcg) | ||
27 | { | ||
28 | if (!css_tryget(&blkcg->css)) | ||
29 | return false; | ||
30 | return true; | ||
31 | } | ||
32 | EXPORT_SYMBOL_GPL(blkiocg_css_tryget); | ||
33 | |||
34 | void blkiocg_css_put(struct blkio_cgroup *blkcg) | ||
35 | { | ||
36 | css_put(&blkcg->css); | ||
37 | } | ||
38 | EXPORT_SYMBOL_GPL(blkiocg_css_put); | ||
39 | |||
40 | struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup) | 26 | struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup) |
41 | { | 27 | { |
42 | return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id), | 28 | return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id), |
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 4d316df863b4..84bf745fa775 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h | |||
@@ -43,9 +43,6 @@ struct blkio_group { | |||
43 | unsigned long sectors; | 43 | unsigned long sectors; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | extern bool blkiocg_css_tryget(struct blkio_cgroup *blkcg); | ||
47 | extern void blkiocg_css_put(struct blkio_cgroup *blkcg); | ||
48 | |||
49 | typedef void (blkio_unlink_group_fn) (void *key, struct blkio_group *blkg); | 46 | typedef void (blkio_unlink_group_fn) (void *key, struct blkio_group *blkg); |
50 | typedef void (blkio_update_group_weight_fn) (struct blkio_group *blkg, | 47 | typedef void (blkio_update_group_weight_fn) (struct blkio_group *blkg, |
51 | unsigned int weight); | 48 | unsigned int weight); |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index e3dedfd3bcb4..10eb286f1f49 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -951,10 +951,6 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) | |||
951 | struct backing_dev_info *bdi = &cfqd->queue->backing_dev_info; | 951 | struct backing_dev_info *bdi = &cfqd->queue->backing_dev_info; |
952 | unsigned int major, minor; | 952 | unsigned int major, minor; |
953 | 953 | ||
954 | /* Do we need to take this reference */ | ||
955 | if (!blkiocg_css_tryget(blkcg)) | ||
956 | return NULL;; | ||
957 | |||
958 | cfqg = cfqg_of_blkg(blkiocg_lookup_group(blkcg, key)); | 954 | cfqg = cfqg_of_blkg(blkiocg_lookup_group(blkcg, key)); |
959 | if (cfqg || !create) | 955 | if (cfqg || !create) |
960 | goto done; | 956 | goto done; |
@@ -985,7 +981,6 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) | |||
985 | hlist_add_head(&cfqg->cfqd_node, &cfqd->cfqg_list); | 981 | hlist_add_head(&cfqg->cfqd_node, &cfqd->cfqg_list); |
986 | 982 | ||
987 | done: | 983 | done: |
988 | blkiocg_css_put(blkcg); | ||
989 | return cfqg; | 984 | return cfqg; |
990 | } | 985 | } |
991 | 986 | ||