aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <[email protected]>2022-05-23 14:43:02 +0200
committerJens Axboe <[email protected]>2022-05-28 06:14:35 -0600
commitebd076bf7d5deef488ec7ebc3fdbf781eafae269 (patch)
treeca69e5ec0d2e266ed4d8b6718901fc37cbadae65
parent98d40e76652e9aeb3aec4065f600d633ed335e94 (diff)
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: 3e08773c3841 ("block: switch polling to be bio based") Signed-off-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
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);