From: Dan Carpenter <dan.carpenter@oracle.com>

Date: Sat, 5 Jun 2021 15:48:16 +0300

Subject: [PATCH] nvme-tcp: fix error codes in nvme_tcp_setup_ctrl()

Git-commit: 522af60cb2f8e3658bda1902fb7f200dcf888a5c

Patch-mainline: v5.14-rc1

References: git-fixes

These error paths currently return success but they should return

-EOPNOTSUPP.

Fixes: 73ffcefcfca0 ("nvme-tcp: check sgl supported by target")

Fixes: 3f2304f8c6d6 ("nvme-tcp: add NVMe over TCP host driver")

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/host/tcp.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c

index 5fc6c568c626..6a65b0516180 100644

--- a/drivers/nvme/host/tcp.c

+++ b/drivers/nvme/host/tcp.c

@@ -1988,11 +1988,13 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)

 		return ret;

 	if (ctrl->icdoff) {

+		ret = -EOPNOTSUPP;

 		dev_err(ctrl->device, "icdoff is not supported!\n");

 		goto destroy_admin;

 	}

 	if (!(ctrl->sgls & ((1 << 0) | (1 << 1)))) {

+		ret = -EOPNOTSUPP;

 		dev_err(ctrl->device, "Mandatory sgls are not supported!\n");

 		goto destroy_admin;

 	}

-- 

2.29.2