diff options
author | Hannes Reinecke <hare@suse.de> | 2011-09-28 10:07:01 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-09-28 10:07:01 -0400 |
commit | 777eb1bf15b8532c396821774bf6451e563438f5 (patch) | |
tree | 8363e63bae76eb049f4c8d0460ef8e1f74f0ca91 /block/blk-sysfs.c | |
parent | a102a9ece5489e1718cd7543aa079082450ac3a2 (diff) |
block: Free queue resources at blk_release_queue()
A kernel crash is observed when a mounted ext3/ext4 filesystem is
physically removed. The problem is that blk_cleanup_queue() frees up
some resources eg by calling elevator_exit(), which are not checked for
in normal operation. So we should rather move these calls to the
destructor function blk_release_queue() as at that point all remaining
references are gone. However, in doing so we have to ensure that any
externally supplied queue_lock is disconnected as the driver might free
up the lock after the call of blk_cleanup_queue(),
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-sysfs.c')
-rw-r--r-- | block/blk-sysfs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index e681805cdb47..60fda88c57f0 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c | |||
@@ -479,6 +479,11 @@ static void blk_release_queue(struct kobject *kobj) | |||
479 | 479 | ||
480 | blk_sync_queue(q); | 480 | blk_sync_queue(q); |
481 | 481 | ||
482 | if (q->elevator) | ||
483 | elevator_exit(q->elevator); | ||
484 | |||
485 | blk_throtl_exit(q); | ||
486 | |||
482 | if (rl->rq_pool) | 487 | if (rl->rq_pool) |
483 | mempool_destroy(rl->rq_pool); | 488 | mempool_destroy(rl->rq_pool); |
484 | 489 | ||