Commit 28982ad7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

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: d690cb8a ("block: add an API to atomically update queue limits")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 61aa894e

drivers/nvme/host/multipath.c

+3 −1
Original line number Diff line number Diff line
@@ -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);