From: Christoph Hellwig <hch@lst.de>
Date: Mon, 14 Jun 2021 13:17:34 +0200
Subject: nvme-multipath: set QUEUE_FLAG_NOWAIT
Patch-mainline: v5.15-rc1
Git-commit: d32d3d0b47f7e34560ae3c55ddfcf68694813501
References: bsc#1190569

The nvme multipathing code just dispatches bios to one of the blk-mq
based paths and never blocks on its own, so set QUEUE_FLAG_NOWAIT
to support REQ_NOWAIT bios.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Acked-by: Daniel Wagner <dwagner@suse.de>
---
 drivers/nvme/host/multipath.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -465,6 +465,8 @@ int nvme_mpath_alloc_disk(struct nvme_ct
 			ctrl->subsys->instance, head->instance);
 
 	blk_queue_flag_set(QUEUE_FLAG_NONROT, head->disk->queue);
+	blk_queue_flag_set(QUEUE_FLAG_NOWAIT, head->disk->queue);
+
 	/* set to a default value of 512 until the disk is validated */
 	blk_queue_logical_block_size(head->disk->queue, 512);
 	blk_set_stacking_limits(&head->disk->queue->limits);