Commit 363f6368 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: don't return an error from nvme_configure_metadata 



When a fabrics controller claims to support an invalidate metadata
configuration we already warn and disable metadata support.  No need to
also return an error during revalidation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Tested-by: default avatarKanchan Joshi <joshi.k@samsung.com>
parent bb49c6fa

drivers/nvme/host/core.c

+5 −8
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	return 0;

}



static int nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id)

static void nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id)

{

	struct nvme_ctrl *ctrl = ns->ctrl;
@@ -1739,7 +1739,8 @@ static int nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id) 


	ns->features &= ~(NVME_NS_METADATA_SUPPORTED | NVME_NS_EXT_LBAS);

	if (!ns->ms || !(ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))

		return 0;

		return;



	if (ctrl->ops->flags & NVME_F_FABRICS) {

		/*

		 * The NVMe over Fabrics specification only supports metadata as
@@ -1747,7 +1748,7 @@ static int nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id) 
		 * remap the separate metadata buffer from the block layer.

		 */

		if (WARN_ON_ONCE(!(id->flbas & NVME_NS_FLBAS_META_EXT)))

			return -EINVAL;

			return;



		ns->features |= NVME_NS_EXT_LBAS;
@@ -1774,8 +1775,6 @@ static int nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id) 
		else

			ns->features |= NVME_NS_METADATA_SUPPORTED;

	}



	return 0;

}



static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
@@ -1916,9 +1915,7 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 
	ns->lba_shift = id->lbaf[lbaf].ds;

	nvme_set_queue_limits(ns->ctrl, ns->queue);



	ret = nvme_configure_metadata(ns, id);

	if (ret)

		goto out_unfreeze;

	nvme_configure_metadata(ns, id);

	nvme_set_chunk_sectors(ns, id);

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