All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-nvme@lists.infradead.org
Cc: hch@lst.de, sagi@grimberg.me,
	Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH 06/14] nvmet: remove repeated call for effects log page
Date: Sun, 27 Jun 2021 22:08:09 -0700	[thread overview]
Message-ID: <20210628050817.19788-7-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <20210628050817.19788-1-chaitanya.kulkarni@wdc.com>

Return status from nvmet_execute_get_log_page_cmd_effects_ns() and
complete the request in nvmet_execute_get_log_page(). This reduces
number of repeated nvmet_req_complete() calls for log page
handlers.

Also, now we can get rid of the goto and out label needed for request
completion and directly return.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
 drivers/nvme/target/admin-cmd.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 2b018b84bf3f..cf02d70dedeb 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -186,16 +186,14 @@ static void nvmet_get_cmd_effects_zns(struct nvme_effects_log *log)
 	log->iocs[nvme_cmd_zone_mgmt_recv]	= cpu_to_le32(1 << 0);
 }
 
-static void nvmet_execute_get_log_cmd_effects_ns(struct nvmet_req *req)
+static u16 nvmet_execute_get_log_cmd_effects_ns(struct nvmet_req *req)
 {
 	struct nvme_effects_log *log;
 	u16 status = NVME_SC_SUCCESS;
 
 	log = kzalloc(sizeof(*log), GFP_KERNEL);
-	if (!log) {
-		status = NVME_SC_INTERNAL;
-		goto out;
-	}
+	if (!log)
+		return NVME_SC_INTERNAL;
 
 	switch (req->cmd->get_log_page.csi) {
 	case NVME_CSI_NVM:
@@ -217,8 +215,8 @@ static void nvmet_execute_get_log_cmd_effects_ns(struct nvmet_req *req)
 	status = nvmet_copy_to_sgl(req, 0, log, sizeof(*log));
 free:
 	kfree(log);
-out:
-	nvmet_req_complete(req, status);
+
+	return status;
 }
 
 static u16 nvmet_execute_get_log_changed_ns(struct nvmet_req *req)
@@ -338,7 +336,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)
 		status = nvmet_execute_get_log_changed_ns(req);
 		break;
 	case NVME_LOG_CMD_EFFECTS:
-		return nvmet_execute_get_log_cmd_effects_ns(req);
+		status = nvmet_execute_get_log_cmd_effects_ns(req);
+		break;
 	case NVME_LOG_ANA:
 		return nvmet_execute_get_log_page_ana(req);
 	default:
-- 
2.22.1


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

  parent reply	other threads:[~2021-06-28  5:10 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-28  5:08 [PATCH 00/14] nvmet: remove repeated calls to nvmet_req_complete() Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 01/14] nvmet: add common req complete for log page Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 02/14] nvmet: remove repeated call for error " Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 03/14] nvmet: remove repeated call for smart " Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 04/14] nvmet: remove repeated call for fw slot " Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 05/14] nvmet: remove repeated call for changed-ns " Chaitanya Kulkarni
2021-06-28  5:08 ` Chaitanya Kulkarni [this message]
2021-06-28  5:08 ` [PATCH 07/14] nvmet: remove repeated call for ana " Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 08/14] nvmet: add default case for nvmet_execute_identify Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 09/14] nvmet: remove repeated call for id-ctrl Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 10/14] nvmet: remove repeated call for id-ns Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 11/14] nvmet: remove repeated call for nslist Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 12/14] nvmet: remove repeated call for desclist Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 13/14] nvmet: remove repeated call for id-cns-ns Chaitanya Kulkarni
2021-06-28  5:08 ` [PATCH 14/14] nvmet: remove repeated call for id-cns-ctrl Chaitanya Kulkarni
2021-07-16  7:36 ` [PATCH 00/14] nvmet: remove repeated calls to nvmet_req_complete() Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210628050817.19788-7-chaitanya.kulkarni@wdc.com \
    --to=chaitanya.kulkarni@wdc.com \
    --cc=hch@lst.de \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.