blk-rq-qos: store a gendisk instead of request_queue in struct rq_qos

[linux-2.6-microblaze.git] / block / blk-iolatency.c

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index f6aeb3d..8e1e43b 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -292,7 +292,7 @@ static void __blkcg_iolatency_throttle(struct rq_qos *rqos,
        unsigned use_delay = atomic_read(&lat_to_blkg(iolat)->use_delay);
 
        if (use_delay)
-               blkcg_schedule_throttle(rqos->q->disk, use_memdelay);
+               blkcg_schedule_throttle(rqos->disk, use_memdelay);
 
        /*
         * To avoid priority inversions we want to just take a slot if we are
@@ -330,7 +330,7 @@ static void scale_cookie_change(struct blk_iolatency *blkiolat,
                                struct child_latency_info *lat_info,
                                bool up)
 {
-       unsigned long qd = blkiolat->rqos.q->nr_requests;
+       unsigned long qd = blkiolat->rqos.disk->queue->nr_requests;
        unsigned long scale = scale_amount(qd, up);
        unsigned long old = atomic_read(&lat_info->scale_cookie);
        unsigned long max_scale = qd << 1;
@@ -372,7 +372,7 @@ static void scale_cookie_change(struct blk_iolatency *blkiolat,
  */
 static void scale_change(struct iolatency_grp *iolat, bool up)
 {
-       unsigned long qd = iolat->blkiolat->rqos.q->nr_requests;
+       unsigned long qd = iolat->blkiolat->rqos.disk->queue->nr_requests;
        unsigned long scale = scale_amount(qd, up);
        unsigned long old = iolat->max_depth;
 
@@ -646,7 +646,7 @@ static void blkcg_iolatency_exit(struct rq_qos *rqos)
 
        timer_shutdown_sync(&blkiolat->timer);
        flush_work(&blkiolat->enable_work);
-       blkcg_deactivate_policy(rqos->q, &blkcg_policy_iolatency);
+       blkcg_deactivate_policy(rqos->disk->queue, &blkcg_policy_iolatency);
        kfree(blkiolat);
 }
 
@@ -665,7 +665,7 @@ static void blkiolatency_timer_fn(struct timer_list *t)
 
        rcu_read_lock();
        blkg_for_each_descendant_pre(blkg, pos_css,
-                                    blkiolat->rqos.q->root_blkg) {
+                                    blkiolat->rqos.disk->queue->root_blkg) {
                struct iolatency_grp *iolat;
                struct child_latency_info *lat_info;
                unsigned long flags;
@@ -749,9 +749,9 @@ static void blkiolatency_enable_work_fn(struct work_struct *work)
         */
        enabled = atomic_read(&blkiolat->enable_cnt);
        if (enabled != blkiolat->enabled) {
-               blk_mq_freeze_queue(blkiolat->rqos.q);
+               blk_mq_freeze_queue(blkiolat->rqos.disk->queue);
                blkiolat->enabled = enabled;
-               blk_mq_unfreeze_queue(blkiolat->rqos.q);
+               blk_mq_unfreeze_queue(blkiolat->rqos.disk->queue);
        }
 }