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 902203bdddb4b47523899edd6121813b3d7e9715..e7bd7050d684027e03f25c2aa6ea6f5d81e554b0 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2411,7 +2411,8 @@ void blk_throtl_exit(struct gendisk *disk)
 {
        struct request_queue *q = disk->queue;
 
-       BUG_ON(!q->td);
+       if (!q->td)
+               return;
        del_timer_sync(&q->td->service_queue.pending_timer);
        throtl_shutdown_wq(q);
        blkcg_deactivate_policy(disk, &blkcg_policy_throtl);