Merge tag 'for-5.12/drivers-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / nvme / host / multipath.c

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 1427c95..a1d476e 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -677,6 +677,10 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)
        if (blk_queue_stable_writes(ns->queue) && ns->head->disk)
                blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES,
                                   ns->head->disk->queue);
+#ifdef CONFIG_BLK_DEV_ZONED
+       if (blk_queue_is_zoned(ns->queue) && ns->head->disk)
+               ns->head->disk->queue->nr_zones = ns->queue->nr_zones;
+#endif
 }
 
 void nvme_mpath_remove_disk(struct nvme_ns_head *head)