github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nvme-rdma: fix error code in nvme_rdma_setup_ctrl

Browse Source 
[ Upstream commit 0974812200 ]

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: c66e2998c8 ("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>
This commit is contained in:
Max Gurtovoy 2021-10-17 11:58:16 +03:00 committed by Greg Kroah-Hartman
parent 7668cbe0cb
commit e8c0b74845
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nvme/host/rdma.c
View File

@ -1103,11 +1103,13 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new)
return ret; return ret;
if (ctrl->ctrl.icdoff) { if (ctrl->ctrl.icdoff) {
ret = -EOPNOTSUPP;
dev_err(ctrl->ctrl.device, "icdoff is not supported!\n"); dev_err(ctrl->ctrl.device, "icdoff is not supported!\n");
goto destroy_admin; goto destroy_admin;
} }
if (!(ctrl->ctrl.sgls & (1 << 2))) { if (!(ctrl->ctrl.sgls & (1 << 2))) {
ret = -EOPNOTSUPP;
dev_err(ctrl->ctrl.device, dev_err(ctrl->ctrl.device,
"Mandatory keyed sgls are not supported!\n"); "Mandatory keyed sgls are not supported!\n");
goto destroy_admin; goto destroy_admin;