Browse files

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 <>
Signed-off-by: Jens Axboe <>
  • Loading branch information...
hreinecke authored and axboe committed Sep 28, 2011
1 parent a102a9e commit 777eb1bf15b8532c396821774bf6451e563438f5
Showing with 11 additions and 7 deletions.
  1. +6 −7 block/blk-core.c
  2. +5 −0 block/blk-sysfs.c
@@ -348,9 +348,10 @@ void blk_put_queue(struct request_queue *q)
- * Note: If a driver supplied the queue lock, it should not zap that lock
- * unexpectedly as some queue cleanup components like elevator_exit() and
- * blk_throtl_exit() need queue lock.
+ * Note: If a driver supplied the queue lock, it is disconnected
+ * by this function. The actual state of the lock doesn't matter
+ * here as the request_queue isn't accessible after this point
+ * (QUEUE_FLAG_DEAD is set) and no other requests will be queued.
void blk_cleanup_queue(struct request_queue *q)
@@ -367,10 +368,8 @@ void blk_cleanup_queue(struct request_queue *q)
queue_flag_set_unlocked(QUEUE_FLAG_DEAD, q);
- if (q->elevator)
- elevator_exit(q->elevator);
- blk_throtl_exit(q);
+ if (q->queue_lock != &q->__queue_lock)
+ q->queue_lock = &q->__queue_lock;
@@ -479,6 +479,11 @@ static void blk_release_queue(struct kobject *kobj)
+ if (q->elevator)
+ elevator_exit(q->elevator);
+ blk_throtl_exit(q);
if (rl->rq_pool)

0 comments on commit 777eb1b

Please sign in to comment.