From: Christoph Hellwig <hch@lst.de>

Date: Mon, 23 May 2022 14:43:02 +0200

Subject: [PATCH] block: use bio_queue_enter instead of blk_queue_enter in

 bio_poll

Git-commit: ebd076bf7d5deef488ec7ebc3fdbf781eafae269

Patch-mainline: v5.19-rc1

References: jsc#PED-1183

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>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 block/blk-core.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/blk-core.c b/block/blk-core.c

index 23312df7d25d..f002fed8e5a5 100644

--- a/block/blk-core.c

+++ b/block/blk-core.c

@@ -943,7 +943,7 @@ int bio_poll(struct bio *bio, struct io_comp_batch *iob, unsigned int flags)

 	blk_flush_plug(current->plug, false);

-	if (blk_queue_enter(q, BLK_MQ_REQ_NOWAIT))

+	if (bio_queue_enter(bio))

 		return 0;

 	if (queue_is_mq(q)) {

 		ret = blk_mq_poll(q, cookie, iob, flags);

-- 

2.35.3