Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ac94be authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Greg Kroah-Hartman
Browse files

nvmet: remove unnecessary ctrl parameter 



[ Upstream commit de5878048e11f1ec44164ebb8994de132074367a ]

The function nvmet_ctrl_find_get() accepts out pointer to nvmet_ctrl
structure. This function returns the same error value from two places
that is :- NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR.

Move this to the caller so we can change the return type to nvmet_ctrl.

Now that we can changed the return type, instead of taking out pointer
to the nvmet_ctrl structure remove that function parameter and return
the valid nvmet_ctrl pointer on success and NULL on failure.

Also, add and rename the goto labels for more readability with comments.

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Stable-dep-of: 1c22e0295a5e ("nvmet: nul-terminate the NQNs passed in the connect command")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 07009245

drivers/nvme/target/core.c

+11 −10
Original line number Diff line number Diff line
@@ -1107,19 +1107,19 @@ static void nvmet_init_cap(struct nvmet_ctrl *ctrl) 
	ctrl->cap |= NVMET_QUEUE_SIZE - 1;

}



u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid,

		struct nvmet_req *req, struct nvmet_ctrl **ret)

struct nvmet_ctrl *nvmet_ctrl_find_get(const char *subsysnqn,

				       const char *hostnqn, u16 cntlid,

				       struct nvmet_req *req)

{

	struct nvmet_ctrl *ctrl = NULL;

	struct nvmet_subsys *subsys;

	struct nvmet_ctrl *ctrl;

	u16 status = 0;



	subsys = nvmet_find_get_subsys(req->port, subsysnqn);

	if (!subsys) {

		pr_warn("connect request for invalid subsystem %s!\n",

			subsysnqn);

		req->cqe->result.u32 = IPO_IATTR_CONNECT_DATA(subsysnqn);

		return NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;

		goto out;

	}



	mutex_lock(&subsys->lock);
@@ -1132,20 +1132,21 @@ u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid, 
			if (!kref_get_unless_zero(&ctrl->ref))

				continue;



			*ret = ctrl;

			goto out;

			/* ctrl found */

			goto found;

		}

	}



	ctrl = NULL; /* ctrl not found */

	pr_warn("could not find controller %d for subsys %s / host %s\n",

		cntlid, subsysnqn, hostnqn);

	req->cqe->result.u32 = IPO_IATTR_CONNECT_DATA(cntlid);

	status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;



out:

found:

	mutex_unlock(&subsys->lock);

	nvmet_subsys_put(subsys);

	return status;

out:

	return ctrl;

}



u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd)

drivers/nvme/target/fabrics-cmd.c

+6 −5
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) 
{

	struct nvmf_connect_command *c = &req->cmd->connect;

	struct nvmf_connect_data *d;

	struct nvmet_ctrl *ctrl = NULL;

	struct nvmet_ctrl *ctrl;

	u16 qid = le16_to_cpu(c->qid);

	u16 status = 0;
@@ -237,11 +237,12 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) 
		goto out;

	}



	status = nvmet_ctrl_find_get(d->subsysnqn, d->hostnqn,

				     le16_to_cpu(d->cntlid),

				     req, &ctrl);

	if (status)

	ctrl = nvmet_ctrl_find_get(d->subsysnqn, d->hostnqn,

				   le16_to_cpu(d->cntlid), req);

	if (!ctrl) {

		status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;

		goto out;

	}



	if (unlikely(qid > ctrl->subsys->max_qid)) {

		pr_warn("invalid queue id (%d)\n", qid);

drivers/nvme/target/nvmet.h

+3 −2
Original line number Diff line number Diff line
@@ -394,8 +394,9 @@ void nvmet_ctrl_fatal_error(struct nvmet_ctrl *ctrl); 
void nvmet_update_cc(struct nvmet_ctrl *ctrl, u32 new);

u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,

		struct nvmet_req *req, u32 kato, struct nvmet_ctrl **ctrlp);

u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid,

		struct nvmet_req *req, struct nvmet_ctrl **ret);

struct nvmet_ctrl *nvmet_ctrl_find_get(const char *subsysnqn,

				       const char *hostnqn, u16 cntlid,

				       struct nvmet_req *req);

void nvmet_ctrl_put(struct nvmet_ctrl *ctrl);

u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd);