diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-throttle.c | 3 | ||||
| -rw-r--r-- | block/genhd.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 902203bdddb4..e7bd7050d684 100644 --- 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); diff --git a/block/genhd.c b/block/genhd.c index 7e031559bf51..65373738c70b 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -668,8 +668,6 @@ void del_gendisk(struct gendisk *disk) rq_qos_exit(q); blk_mq_unquiesce_queue(q); - blkcg_exit_disk(disk); - /* * If the disk does not own the queue, allow using passthrough requests * again. Else leave the queue frozen to fail all I/O. @@ -1166,6 +1164,8 @@ static void disk_release(struct device *dev) might_sleep(); WARN_ON_ONCE(disk_live(disk)); + blkcg_exit_disk(disk); + /* * To undo the all initialization from blk_mq_init_allocated_queue in * case of a probe failure where add_disk is never called we have to |