Commit c54a06d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: Free queue resources at blk_release_queue()
parents e689ec80 777eb1bf
...@@ -348,9 +348,10 @@ void blk_put_queue(struct request_queue *q) ...@@ -348,9 +348,10 @@ void blk_put_queue(struct request_queue *q)
EXPORT_SYMBOL(blk_put_queue); EXPORT_SYMBOL(blk_put_queue);
/* /*
* Note: If a driver supplied the queue lock, it should not zap that lock * Note: If a driver supplied the queue lock, it is disconnected
* unexpectedly as some queue cleanup components like elevator_exit() and * by this function. The actual state of the lock doesn't matter
* blk_throtl_exit() need queue lock. * 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) void blk_cleanup_queue(struct request_queue *q)
{ {
...@@ -367,10 +368,8 @@ 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); queue_flag_set_unlocked(QUEUE_FLAG_DEAD, q);
mutex_unlock(&q->sysfs_lock); mutex_unlock(&q->sysfs_lock);
if (q->elevator) if (q->queue_lock != &q->__queue_lock)
elevator_exit(q->elevator); q->queue_lock = &q->__queue_lock;
blk_throtl_exit(q);
blk_put_queue(q); blk_put_queue(q);
} }
......
...@@ -479,6 +479,11 @@ static void blk_release_queue(struct kobject *kobj) ...@@ -479,6 +479,11 @@ static void blk_release_queue(struct kobject *kobj)
blk_sync_queue(q); blk_sync_queue(q);
if (q->elevator)
elevator_exit(q->elevator);
blk_throtl_exit(q);
if (rl->rq_pool) if (rl->rq_pool)
mempool_destroy(rl->rq_pool); mempool_destroy(rl->rq_pool);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment