[PATCH 6/6] nvmet: remove unnecessary function parameters
From: Chaitanya Kulkarni <hidden>
Date: 2021-02-16 21:32:13
Subsystem:
nvm express target driver, the rest · Maintainers:
Christoph Hellwig, Sagi Grimberg, Chaitanya Kulkarni, Linus Torvalds
The function nvmet_alloc_ctrl() accepts subsysnqn, hostnqn, cntlid, nvmet_req, and out pointer to nvmet_ctrl structure. The parameters subsysnqn, hostnqn and cntlid can be derived from the caller's struct nvmf_connect_data. Replace these parameters with structure pointer nvmf_connect_data *d. Signed-off-by: Chaitanya Kulkarni <redacted> --- drivers/nvme/target/core.c | 16 ++++++++-------- drivers/nvme/target/fabrics-cmd.c | 3 +-- drivers/nvme/target/nvmet.h | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 5915b7cc65a6..9ad001fc07f9 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c@@ -1296,27 +1296,27 @@ static void nvmet_fatal_error_handler(struct work_struct *work) ctrl->ops->delete_ctrl(ctrl); } -u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, - struct nvmet_req *req, u32 kato, struct nvmet_ctrl **ctrlp) +u16 nvmet_alloc_ctrl(struct nvmf_connect_data *d, struct nvmet_req *req, + u32 kato, struct nvmet_ctrl **ctrlp) { struct nvmet_subsys *subsys; struct nvmet_ctrl *ctrl; int ret; u16 status; - subsys = nvmet_find_get_subsys(req->port, subsysnqn); + subsys = nvmet_find_get_subsys(req->port, d->subsysnqn); if (!subsys) { pr_warn("connect request for invalid subsystem %s!\n", - subsysnqn); + d->subsysnqn); req->cqe->result.u32 = IPO_IATTR_CONNECT_DATA(subsysnqn); status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR; goto out; } down_read(&nvmet_config_sem); - if (!nvmet_host_allowed(subsys, hostnqn)) { + if (!nvmet_host_allowed(subsys, d->hostnqn)) { pr_info("connect by host %s for subsystem %s not allowed\n", - hostnqn, subsysnqn); + d->hostnqn, d->subsysnqn); req->cqe->result.u32 = IPO_IATTR_CONNECT_DATA(hostnqn); up_read(&nvmet_config_sem); status = NVME_SC_CONNECT_INVALID_HOST | NVME_SC_DNR;
@@ -1339,8 +1339,8 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, INIT_RADIX_TREE(&ctrl->p2p_ns_map, GFP_KERNEL); INIT_WORK(&ctrl->fatal_err_work, nvmet_fatal_error_handler); - memcpy(ctrl->subsysnqn, subsysnqn, NVMF_NQN_SIZE); - memcpy(ctrl->hostnqn, hostnqn, NVMF_NQN_SIZE); + memcpy(ctrl->subsysnqn, d->subsysnqn, NVMF_NQN_SIZE); + memcpy(ctrl->hostnqn, d->hostnqn, NVMF_NQN_SIZE); kref_init(&ctrl->ref); ctrl->subsys = subsys;
diff --git a/drivers/nvme/target/fabrics-cmd.c b/drivers/nvme/target/fabrics-cmd.c
index 46578f98abcc..aa530e0e112d 100644
--- a/drivers/nvme/target/fabrics-cmd.c
+++ b/drivers/nvme/target/fabrics-cmd.c@@ -188,8 +188,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) goto out; } - status = nvmet_alloc_ctrl(d->subsysnqn, d->hostnqn, req, - le32_to_cpu(c->kato), &ctrl); + status = nvmet_alloc_ctrl(d, req, le32_to_cpu(c->kato), &ctrl); if (status) { if (status == (NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR) || status == (NVME_SC_CONNECT_INVALID_HOST | NVME_SC_DNR))
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index 2dd4a91e5e0e..eaa5b7208a36 100644
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h@@ -431,8 +431,8 @@ int nvmet_sq_init(struct nvmet_sq *sq); 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_alloc_ctrl(struct nvmf_connect_data *d, struct nvmet_req *req, + u32 kato, struct nvmet_ctrl **ctrlp); struct nvmet_ctrl *nvmet_ctrl_find_get(struct nvmf_connect_data *d, struct nvmet_req *req); void nvmet_ctrl_put(struct nvmet_ctrl *ctrl);
--
2.22.1
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme