[PATCH 4/7] nvmet: centralize req completion for noop log
Chaitanya Kulkarni
kch at nvidia.com
Thu Mar 23 00:52:00 PDT 2023
Remove nvmet_req_completion() call from
nvmet_execute_get_log_page_noop() and use the one that is in the caller
nvmet_execute_get_log_page().
Signed-off-by: Chaitanya Kulkarni <kch at nvidia.com>
---
drivers/nvme/target/admin-cmd.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index c2f510c80bbf..84cacc93bf65 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -40,9 +40,9 @@ u64 nvmet_get_log_page_offset(struct nvme_command *cmd)
return le64_to_cpu(cmd->get_log_page.lpo);
}
-static void nvmet_execute_get_log_page_noop(struct nvmet_req *req)
+static u16 nvmet_execute_get_log_page_noop(struct nvmet_req *req)
{
- nvmet_req_complete(req, nvmet_zero_sgl(req, 0, req->transfer_len));
+ return nvmet_zero_sgl(req, 0, req->transfer_len);
}
static u16 nvmet_execute_get_log_page_error(struct nvmet_req *req)
@@ -336,7 +336,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)
* active, so we can zero out the whole firmware slot log and
* still claim to fully implement this mandatory log page.
*/
- return nvmet_execute_get_log_page_noop(req);
+ status = nvmet_execute_get_log_page_noop(req);
+ break;
case NVME_LOG_CHANGED_NS:
return nvmet_execute_get_log_changed_ns(req);
case NVME_LOG_CMD_EFFECTS:
--
2.29.0
More information about the Linux-nvme
mailing list