From: Christoph Hellwig Date: Mon, 14 Jun 2021 11:17:34 +0000 (+0200) Subject: nvme-multipath: set QUEUE_FLAG_NOWAIT X-Git-Tag: v5.15-rc1~16^2~4^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d32d3d0b47f7e34560ae3c55ddfcf68694813501;p=thirdparty%2Fkernel%2Flinux.git nvme-multipath: set QUEUE_FLAG_NOWAIT 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 Reviewed-by: Sagi Grimberg --- diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 37ce3e8b1db2b..d9a82adb856f9 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -465,6 +465,8 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) 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);