blk-cgroup: pass a gendisk to blkcg_{de,}activate_policy

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

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 6fb5a2f..efc0a90 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -388,7 +388,7 @@ static void throtl_pd_init(struct blkg_policy_data *pd)
 {
        struct throtl_grp *tg = pd_to_tg(pd);
        struct blkcg_gq *blkg = tg_to_blkg(tg);
-       struct throtl_data *td = blkg->q->td;
+       struct throtl_data *td = blkg->disk->queue->td;
        struct throtl_service_queue *sq = &tg->service_queue;
 
        /*
@@ -1175,7 +1175,7 @@ static void throtl_pending_timer_fn(struct timer_list *t)
 
        /* throtl_data may be gone, so figure out request queue by blkg */
        if (tg)
-               q = tg->pd.blkg->q;
+               q = tg->pd.blkg->disk->queue;
        else
                q = td->queue;
 
@@ -2395,7 +2395,7 @@ int blk_throtl_init(struct gendisk *disk)
        td->low_downgrade_time = jiffies;
 
        /* activate policy */
-       ret = blkcg_activate_policy(q, &blkcg_policy_throtl);
+       ret = blkcg_activate_policy(disk, &blkcg_policy_throtl);
        if (ret) {
                free_percpu(td->latency_buckets[READ]);
                free_percpu(td->latency_buckets[WRITE]);
@@ -2411,7 +2411,7 @@ void blk_throtl_exit(struct gendisk *disk)
        BUG_ON(!q->td);
        del_timer_sync(&q->td->service_queue.pending_timer);
        throtl_shutdown_wq(q);
-       blkcg_deactivate_policy(q, &blkcg_policy_throtl);
+       blkcg_deactivate_policy(disk, &blkcg_policy_throtl);
        free_percpu(q->td->latency_buckets[READ]);
        free_percpu(q->td->latency_buckets[WRITE]);
        kfree(q->td);