diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index b6e095c7ef5e..91af2f2e59ce 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -952,7 +952,6 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) | |||
952 | if (!cfqg) | 952 | if (!cfqg) |
953 | goto done; | 953 | goto done; |
954 | 954 | ||
955 | cfqg->weight = blkcg->weight; | ||
956 | for_each_cfqg_st(cfqg, i, j, st) | 955 | for_each_cfqg_st(cfqg, i, j, st) |
957 | *st = CFQ_RB_ROOT; | 956 | *st = CFQ_RB_ROOT; |
958 | RB_CLEAR_NODE(&cfqg->rb_node); | 957 | RB_CLEAR_NODE(&cfqg->rb_node); |
@@ -970,6 +969,7 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) | |||
970 | sscanf(dev_name(bdi->dev), "%u:%u", &major, &minor); | 969 | sscanf(dev_name(bdi->dev), "%u:%u", &major, &minor); |
971 | blkiocg_add_blkio_group(blkcg, &cfqg->blkg, (void *)cfqd, | 970 | blkiocg_add_blkio_group(blkcg, &cfqg->blkg, (void *)cfqd, |
972 | MKDEV(major, minor)); | 971 | MKDEV(major, minor)); |
972 | cfqg->weight = blkcg_get_weight(blkcg, cfqg->blkg.dev); | ||
973 | 973 | ||
974 | /* Add group on cfqd list */ | 974 | /* Add group on cfqd list */ |
975 | hlist_add_head(&cfqg->cfqd_node, &cfqd->cfqg_list); | 975 | hlist_add_head(&cfqg->cfqd_node, &cfqd->cfqg_list); |