diff options
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 39c43307dc6c..8cca6161d0bc 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -374,7 +374,7 @@ static inline struct cfq_group *blkg_to_cfqg(struct blkio_group *blkg) | |||
| 374 | 374 | ||
| 375 | static inline struct blkio_group *cfqg_to_blkg(struct cfq_group *cfqg) | 375 | static inline struct blkio_group *cfqg_to_blkg(struct cfq_group *cfqg) |
| 376 | { | 376 | { |
| 377 | return pdata_to_blkg(cfqg, &blkio_policy_cfq); | 377 | return pdata_to_blkg(cfqg); |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | static inline void cfqg_get(struct cfq_group *cfqg) | 380 | static inline void cfqg_get(struct cfq_group *cfqg) |
| @@ -1092,7 +1092,7 @@ static struct cfq_group *cfq_lookup_create_cfqg(struct cfq_data *cfqd, | |||
| 1092 | } else { | 1092 | } else { |
| 1093 | struct blkio_group *blkg; | 1093 | struct blkio_group *blkg; |
| 1094 | 1094 | ||
| 1095 | blkg = blkg_lookup_create(blkcg, q, BLKIO_POLICY_PROP, false); | 1095 | blkg = blkg_lookup_create(blkcg, q, false); |
| 1096 | if (!IS_ERR(blkg)) | 1096 | if (!IS_ERR(blkg)) |
| 1097 | cfqg = blkg_to_cfqg(blkg); | 1097 | cfqg = blkg_to_cfqg(blkg); |
| 1098 | } | 1098 | } |
| @@ -3523,8 +3523,7 @@ static int cfq_init_queue(struct request_queue *q) | |||
| 3523 | rcu_read_lock(); | 3523 | rcu_read_lock(); |
| 3524 | spin_lock_irq(q->queue_lock); | 3524 | spin_lock_irq(q->queue_lock); |
| 3525 | 3525 | ||
| 3526 | blkg = blkg_lookup_create(&blkio_root_cgroup, q, BLKIO_POLICY_PROP, | 3526 | blkg = blkg_lookup_create(&blkio_root_cgroup, q, true); |
| 3527 | true); | ||
| 3528 | if (!IS_ERR(blkg)) | 3527 | if (!IS_ERR(blkg)) |
| 3529 | cfqd->root_group = blkg_to_cfqg(blkg); | 3528 | cfqd->root_group = blkg_to_cfqg(blkg); |
| 3530 | 3529 | ||
