From: Jeffle Xu <jefflexu@linux.alibaba.com>
Date: Mon, 19 Oct 2020 08:59:42 +0000 (+0800)
Subject: io_uring: use blk_queue_nowait() to check if NOWAIT supported
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ba0d0c81284f4ec0b24529bdba2fc68b9d6a09a;p=linux.git

io_uring: use blk_queue_nowait() to check if NOWAIT supported

commit 021a24460dc2 ("block: add QUEUE_FLAG_NOWAIT") adds a new helper
function blk_queue_nowait() to check if the bdev supports handling of
REQ_NOWAIT or not. Since then bio-based dm device can also support
REQ_NOWAIT, and currently only dm-linear supports that since
commit 6abc49468eea ("dm: add support for REQ_NOWAIT and enable it for
linear target").

Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index e1726f4574614..0f4a9c45061d9 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2693,7 +2693,7 @@ static struct file *__io_file_get(struct io_submit_state *state, int fd)
 static bool io_bdev_nowait(struct block_device *bdev)
 {
 #ifdef CONFIG_BLOCK
-	return !bdev || queue_is_mq(bdev_get_queue(bdev));
+	return !bdev || blk_queue_nowait(bdev_get_queue(bdev));
 #else
 	return true;
 #endif