blk-rq-qos: make rq_qos_add and rq_qos_del more useful

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

diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 119a436..75565ae 100644 (file)
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -932,9 +932,6 @@ int wbt_init(struct gendisk *disk)
        for (i = 0; i < WBT_NUM_RWQ; i++)
                rq_wait_init(&rwb->rq_wait[i]);
 
-       rwb->rqos.id = RQ_QOS_WBT;
-       rwb->rqos.ops = &wbt_rqos_ops;
-       rwb->rqos.q = q;
        rwb->last_comp = rwb->last_issue = jiffies;
        rwb->win_nsec = RWB_WINDOW_NSEC;
        rwb->enable_state = WBT_STATE_ON_DEFAULT;
@@ -947,7 +944,7 @@ int wbt_init(struct gendisk *disk)
        /*
         * Assign rwb and add the stats callback.
         */
-       ret = rq_qos_add(q, &rwb->rqos);
+       ret = rq_qos_add(&rwb->rqos, disk, RQ_QOS_WBT, &wbt_rqos_ops);
        if (ret)
                goto err_free;