]> git.baikalelectronics.ru Git - kernel.git/commit
block: move blk_exit_queue into __blk_release_queue
authorMing Lei <ming.lei@redhat.com>
Wed, 15 May 2019 03:03:08 +0000 (11:03 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 29 May 2019 12:09:09 +0000 (06:09 -0600)
commit6e324616f262e520273a241d567d996ef23270e2
tree2bce0a16a4235e5a9b4635a3db4b2dabceb532ce
parent022c1b399a2163340a563fda594a096b3b9f8738
block: move blk_exit_queue into __blk_release_queue

Commit 466f0cff4b45 ("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 466f0cff4b45 doesn't
exist any more.

So move move blk_exit_queue into __blk_release_queue.

This patch basically reverts the following two commits:

466f0cff4b45 block: Fix a race between the cgroup code and request queue initialization
6c16a49e7b82 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>
block/blk-core.c
block/blk-sysfs.c
block/blk.h