Commit 8f03cfa1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

nvme: don't use nvme_update_disk_info for the multipath disk 



Currently nvme_update_ns_info_block calls nvme_update_disk_info both for
the namespace attached disk, and the multipath one (if it exists).  This
is very different from how other stacking drivers work, and leads to
a lot of complexity.

Switch to setting the disk capacity and initializing the integrity
profile, and let blk_stack_limits which already is called just below
deal with updating the other limits.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 414c62e2

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2159,7 +2159,8 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, 


	if (nvme_ns_head_multipath(ns->head)) {

		blk_mq_freeze_queue(ns->head->disk->queue);

		nvme_update_disk_info(ns->ctrl, ns->head->disk, ns->head, id);

		nvme_init_integrity(ns->head->disk, ns->head);

		set_capacity_and_notify(ns->head->disk, get_capacity(ns->disk));

		set_disk_ro(ns->head->disk, nvme_ns_is_readonly(ns, info));

		nvme_mpath_revalidate_paths(ns);

		blk_stack_limits(&ns->head->disk->queue->limits,