Revert "blk-cgroup: pin the gendisk in struct blkcg_gq"

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

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 74bb1e753ea09de6439ea7cb81f3324fb21a9dd6..47e9d8be68f300bc3a57652dfa6c354470f966e0 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -387,7 +387,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->disk->queue->td;
+       struct throtl_data *td = blkg->q->td;
        struct throtl_service_queue *sq = &tg->service_queue;
 
        /*
@@ -1174,7 +1174,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->disk->queue;
+               q = tg->pd.blkg->q;
        else
                q = td->queue;