]> 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)
commit67411508686de64cd5d14e7c144dc22d91183599
tree2bce0a16a4235e5a9b4635a3db4b2dabceb532ce
parent89747f2d03b810a9c364138d4f28d90a808dd74c
block: move blk_exit_queue into __blk_release_queue

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

So move move blk_exit_queue into __blk_release_queue.

This patch basically reverts the following two commits:

f6e4885082ee block: Fix a race between the cgroup code and request queue initialization
c7372fbc1873 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