From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-nvme@lists.infradead.org
Cc: hch@lst.de, kbusch@kernel.org, sagi@grimberg.me,
damien.lemoal@wdc.com,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH V10 7/8] nvme-core: add a helper to print css related error
Date: Mon, 8 Mar 2021 20:58:22 -0800 [thread overview]
Message-ID: <20210309045823.18545-8-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <20210309045823.18545-1-chaitanya.kulkarni@wdc.com>
Right now there are two functions which are printing same error if
multi command sets is not supported by the namespace in the question.
Instead of repeating the code for error handling (dev_warn() + err code,
add a helper.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
drivers/nvme/host/core.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3a372db00b9f..93421bb531b6 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -93,6 +93,12 @@ static void nvme_put_subsystem(struct nvme_subsystem *subsys);
static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
unsigned nsid);
+static int nvme_ns_css_print_err(struct nvme_ctrl *ctrl, unsigned int nsid)
+{
+ dev_warn(ctrl->device, "Command set not reported for nsid:%u\n", nsid);
+ return -EINVAL;
+}
+
/*
* Prepare a queue for teardown.
*
@@ -1408,11 +1414,8 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid,
len += sizeof(*cur);
}
- if (nvme_multi_css(ctrl) && !csi_seen) {
- dev_warn(ctrl->device, "Command set not reported for nsid:%d\n",
- nsid);
- status = -EINVAL;
- }
+ if (nvme_multi_css(ctrl) && !csi_seen)
+ status = nvme_ns_css_print_err(ctrl, nsid);
free_data:
kfree(data);
@@ -2218,10 +2221,7 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
if (ns->head->ids.csi == NVME_CSI_ZNS) {
if (!nvme_multi_css(ns->ctrl)) {
- dev_warn(ns->ctrl->device,
- "Command set not reported for nsid:%d\n",
- ns->head->ns_id);
- ret = -EINVAL;
+ ret = nvme_ns_css_print_err(ns->ctrl, ns->head->ns_id);
goto out_unfreeze;
}
ret = nvme_update_zone_info(ns, lbaf);
--
2.22.1
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-03-09 5:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 4:58 [PATCH V10 0/8] nvmet: add ZBD backend support Chaitanya Kulkarni
2021-03-09 4:58 ` [PATCH V10 1/8] nvmet: trim args for nvmet_copy_ns_identifier() Chaitanya Kulkarni
2021-03-09 11:34 ` Christoph Hellwig
2021-03-09 20:54 ` Chaitanya Kulkarni
2021-03-09 21:03 ` Chaitanya Kulkarni
2021-03-10 8:49 ` Christoph Hellwig
2021-03-10 8:52 ` Chaitanya Kulkarni
2021-03-09 4:58 ` [PATCH V10 2/8] nvmet: add NVM Command Set Identifier support Chaitanya Kulkarni
2021-03-09 11:37 ` Christoph Hellwig
2021-03-09 21:07 ` Chaitanya Kulkarni
2021-03-09 4:58 ` [PATCH V10 3/8] nvmet: add command set supported ctrl cap Chaitanya Kulkarni
2021-03-09 11:38 ` Christoph Hellwig
2021-03-09 21:09 ` Chaitanya Kulkarni
2021-03-10 7:05 ` Chaitanya Kulkarni
2021-03-10 7:14 ` hch
2021-03-09 4:58 ` [PATCH V10 4/8] nvmet: add ZBD over ZNS backend support Chaitanya Kulkarni
2021-03-09 11:41 ` Christoph Hellwig
2021-03-09 21:13 ` Chaitanya Kulkarni
2021-03-09 4:58 ` [PATCH V10 5/8] nvmet: add nvmet_req_bio put helper for backends Chaitanya Kulkarni
2021-03-09 4:58 ` [PATCH V10 6/8] nvme-core: check ctrl css before setting up zns Chaitanya Kulkarni
2021-03-09 11:42 ` Christoph Hellwig
2021-03-09 15:03 ` Christoph Hellwig
2021-03-10 1:14 ` Chaitanya Kulkarni
2021-03-09 4:58 ` Chaitanya Kulkarni [this message]
2021-03-09 4:58 ` [PATCH V10 8/8] nvme: add comments to nvme_zns_alloc_report_buffer Chaitanya Kulkarni
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=20210309045823.18545-8-chaitanya.kulkarni@wdc.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=damien.lemoal@wdc.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).