Commit ebd076bf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: use bio_queue_enter instead of blk_queue_enter in bio_poll 



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

Fixes: 3e08773c ("block: switch polling to be bio based")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220523124302.526186-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 98d40e76

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);