Revert "blk-cgroup: delay calling blkcg_exit_disk until disk_release"

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

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 21c8d5e871eac933fcb761f90f98cf09b45f7143..74bb1e753ea09de6439ea7cb81f3324fb21a9dd6 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2407,8 +2407,7 @@ void blk_throtl_exit(struct gendisk *disk)
 {
        struct request_queue *q = disk->queue;
 
-       if (!q->td)
-               return;
+       BUG_ON(!q->td);
        del_timer_sync(&q->td->service_queue.pending_timer);
        throtl_shutdown_wq(q);
        blkcg_deactivate_policy(disk, &blkcg_policy_throtl);