block: use bio_queue_enter instead of blk_queue_enter in bio_poll

[ Upstream commit ebd076bf7d5deef488ec7ebc3fdbf781eafae269 ]

We want to have a valid live gendisk to call ->poll and not just a
request_queue, so call the right helper.

Fixes: 3e08773c3841 ("block: switch polling to be bio based")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220523124302.526186-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/block/blk-core.c b/block/blk-core.c
index 779b4a1f66ac22db6ac8cabba216bcca5bdfd940..45d750eb262832cedec52271901baa30d8efe551 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -992,7 +992,7 @@ int bio_poll(struct bio *bio, struct io_comp_batch *iob, unsigned int flags)
        if (current->plug)
                blk_flush_plug(current->plug, false);
 
-       if (blk_queue_enter(q, BLK_MQ_REQ_NOWAIT))
+       if (bio_queue_enter(bio))
                return 0;
        if (WARN_ON_ONCE(!queue_is_mq(q)))
                ret = 0;        /* not yet implemented, should not happen */