diff options
| author | Ming Lei <ming.lei@redhat.com> | 2019-05-15 11:03:08 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-05-29 06:09:09 -0600 |
| commit | 47cdee29ef9d94e485eb08f962c74943023a5271 (patch) | |
| tree | 2bce0a16a4235e5a9b4635a3db4b2dabceb532ce /block/blk.h | |
| parent | 31cb1d64da4ebd214348cad9d86e663c831c45fc (diff) | |
| download | linux-47cdee29ef9d94e485eb08f962c74943023a5271.tar.bz2 | |
block: move blk_exit_queue into __blk_release_queue
Commit 498f6650aec8 ("block: Fix a race between the cgroup code and
request queue initialization") moves what blk_exit_queue does into
blk_cleanup_queue() for fixing issue caused by changing back
queue lock.
However, after legacy request IO path is killed, driver queue lock
won't be used at all, and there isn't story for changing back
queue lock. Then the issue addressed by Commit 498f6650aec8 doesn't
exist any more.
So move move blk_exit_queue into __blk_release_queue.
This patch basically reverts the following two commits:
498f6650aec8 block: Fix a race between the cgroup code and request queue initialization
24ecc3585348 block: Ensure that a request queue is dissociated from the cgroup controller
Cc: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index e27fd1512e4b..91b3581b7c7a 100644 --- a/block/blk.h +++ b/block/blk.h @@ -50,7 +50,6 @@ struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q, int node, int cmd_size, gfp_t flags); void blk_free_flush_queue(struct blk_flush_queue *q); -void blk_exit_queue(struct request_queue *q); void blk_rq_bio_prep(struct request_queue *q, struct request *rq, struct bio *bio); void blk_freeze_queue(struct request_queue *q); |