nvme-rdma: fix error code in nvme_rdma_setup_ctrl

BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit 09748122009aed7bfaa7acc33c10c083a4758322 ]

In case that icdoff is not zero or mandatory keyed sgls are not
supported by the NVMe/RDMA target, we'll go to error flow but we'll
return 0 to the caller. Fix it by returning an appropriate error code.

Fixes: c66e2998c8ca ("nvme-rdma: centralize controller setup sequence")
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 042c594bc57e21915363acee1521c473d217a0cb..0498801542eb674c0de272d47ef5e64abb0021d9 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1095,11 +1095,13 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new)
                return ret;
 
        if (ctrl->ctrl.icdoff) {
+               ret = -EOPNOTSUPP;
                dev_err(ctrl->ctrl.device, "icdoff is not supported!\n");
                goto destroy_admin;
        }
 
        if (!(ctrl->ctrl.sgls & (1 << 2))) {
+               ret = -EOPNOTSUPP;
                dev_err(ctrl->ctrl.device,
                        "Mandatory keyed sgls are not supported!\n");
                goto destroy_admin;