diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-05-23 14:43:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-14 18:44:56 +0200 |
| commit | c90322fc9badf8facf70d4256f254f8e5e6b87bf (patch) | |
| tree | 535e356da7234bdf70f87075eacdcf617b0a0f6a | |
| parent | ebbd33392d28444fdf26e6dedb9f027786ca9115 (diff) | |
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>
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index bc0506772152..84f7b7884d07 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -948,7 +948,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); |