nvme: set BLK_FEAT_ZONED for ZNS multipath disks

The new stricter limits validation doesn't like a max_append_sectors value
to be set without BLK_FEAT_ZONED.  Set it before allocation the disk to
fix this instead of just inheriting it later.

Fixes: d690cb8ae14b ("block: add an API to atomically update queue limits")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 91d9eb3c22eff264101fc51d7d22b2a676e7cc37..518e22dd4f9beadd1daea1a918875438a02d8acf 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -616,7 +616,9 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)
        blk_set_stacking_limits(&lim);
        lim.dma_alignment = 3;
        lim.features |= BLK_FEAT_IO_STAT | BLK_FEAT_NOWAIT | BLK_FEAT_POLL;
-       if (head->ids.csi != NVME_CSI_ZNS)
+       if (head->ids.csi == NVME_CSI_ZNS)
+               lim.features |= BLK_FEAT_ZONED;
+       else
                lim.max_zone_append_sectors = 0;
 
        head->disk = blk_alloc_disk(&lim, ctrl->numa_node);