lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 552/779] nvme: dont return an error from nvme_configure_metadata
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 363f6368603743072e5f318c668c632bccb097a3 ]

    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: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
    Reviewed-by: Daniel Wagner <dwagner@suse.de>
    Tested-by: Kanchan Joshi <joshi.k@samsung.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/core.c | 13 +++++--------
    1 file changed, 5 insertions(+), 8 deletions(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index d9aea6c22f52..ddaad05ff043 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -1719,7 +1719,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;

    @@ -1735,7 +1735,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
    @@ -1743,7 +1744,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;

    @@ -1770,8 +1771,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,
    @@ -1909,9 +1908,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);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 21:33    [W:2.530 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site