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

EXPORT_SYMBOL(blk_put_queue);

/*

 * 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)

{

	queue_flag_set_unlocked(QUEUE_FLAG_DEAD, q);

	mutex_unlock(&q->sysfs_lock);

	if (q->elevator)

		elevator_exit(q->elevator);

	blk_throtl_exit(q);

	if (q->queue_lock != &q->__queue_lock)

		q->queue_lock = &q->__queue_lock;

	blk_put_queue(q);

}

	blk_sync_queue(q);

	if (q->elevator)

		elevator_exit(q->elevator);

	blk_throtl_exit(q);

	if (rl->rq_pool)

		mempool_destroy(rl->rq_pool);