From: jsmart2021@gmail.com (James Smart)
Subject: [PATCH rfc v2 04/10] nvme-cli: Refactor to create a get_nvme_ctrl_info routine
Date: Thu, 11 Jul 2019 17:31:34 -0700 [thread overview]
Message-ID: <20190712003140.16221-5-jsmart2021@gmail.com> (raw)
In-Reply-To: <20190712003140.16221-1-jsmart2021@gmail.com>
In preparation for searching controllers to match with connect args:
Refactor the get_nvme_subsystem_info() routine to take the portion
that creates a ctrl_list_item and sets its values and put it in a
separate get_nvme_ctrl_info() routine.
Signed-off-by: James Smart <jsmart2021 at gmail.com>
CC: Sagi Grimberg <sagi at grimberg.me>
CC: Hannes Reinecke <hare at suse.com>
---
nvme.c | 77 ++++++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 45 insertions(+), 32 deletions(-)
diff --git a/nvme.c b/nvme.c
index 6fe99eb..dabbbe0 100644
--- a/nvme.c
+++ b/nvme.c
@@ -1544,10 +1544,50 @@ static void free_ctrl_list_item(struct ctrl_list_item *ctrls)
free(ctrls->ana_state);
}
+static int get_nvme_ctrl_info(char *name, char *path,
+ struct ctrl_list_item *ctrl, __u32 nsid)
+{
+ char ctrl_path[512];
+
+ ctrl->name = strdup(name);
+
+ snprintf(ctrl_path, sizeof(ctrl_path), "%s/%s", path, ctrl->name);
+
+ ctrl->address = get_nvme_ctrl_attr(ctrl_path, "address");
+ if (!ctrl->address) {
+ fprintf(stderr, "%s: failed to get controller address.\n",
+ ctrl->name);
+ goto free_ctrl_items;
+ }
+
+ ctrl->transport = get_nvme_ctrl_attr(ctrl_path, "transport");
+ if (!ctrl->transport) {
+ fprintf(stderr, "%s: failed to get controller transport.\n",
+ ctrl->name);
+ goto free_ctrl_items;
+ }
+
+ ctrl->state = get_nvme_ctrl_attr(ctrl_path, "state");
+ if (!ctrl->state) {
+ fprintf(stderr, "%s: failed to get controller state.\n",
+ ctrl->name);
+ goto free_ctrl_items;
+ }
+
+ if (nsid != NVME_NSID_ALL)
+ ctrl->ana_state = get_nvme_ctrl_path_ana_state(ctrl_path, nsid);
+
+ return 0; /* success */
+
+free_ctrl_items:
+ free_ctrl_list_item(ctrl);
+
+ return 1; /* failure */
+}
+
static int get_nvme_subsystem_info(char *name, char *path,
struct subsys_list_item *item, __u32 nsid)
{
- char ctrl_path[512];
struct dirent **ctrls;
int n, i, ret = 1, ccnt = 0;
@@ -1574,38 +1614,11 @@ static int get_nvme_subsystem_info(char *name, char *path,
item->nctrls = n;
for (i = 0; i < n; i++) {
- item->ctrls[ccnt].name = strdup(ctrls[i]->d_name);
-
- snprintf(ctrl_path, sizeof(ctrl_path), "%s/%s", path,
- item->ctrls[ccnt].name);
-
- item->ctrls[ccnt].address =
- get_nvme_ctrl_attr(ctrl_path, "address");
- if (!item->ctrls[ccnt].address) {
- fprintf(stderr, "failed to get controller[%d] address.\n", i);
- free_ctrl_list_item(&item->ctrls[ccnt]);
- continue;
+ if (get_nvme_ctrl_info(ctrls[i]->d_name, path,
+ &item->ctrls[ccnt], nsid)) {
+ fprintf(stderr, "failed to get controller[%d] info.\n",
+ i);
}
-
- item->ctrls[ccnt].transport =
- get_nvme_ctrl_attr(ctrl_path, "transport");
- if (!item->ctrls[ccnt].transport) {
- fprintf(stderr, "failed to get controller[%d] transport.\n", i);
- free_ctrl_list_item(&item->ctrls[ccnt]);
- continue;
- }
-
- item->ctrls[ccnt].state =
- get_nvme_ctrl_attr(ctrl_path, "state");
- if (!item->ctrls[ccnt].state) {
- fprintf(stderr, "failed to get controller[%d] state.\n", i);
- free_ctrl_list_item(&item->ctrls[ccnt]);
- continue;
- }
-
- if (nsid != NVME_NSID_ALL)
- item->ctrls[ccnt].ana_state =
- get_nvme_ctrl_path_ana_state(ctrl_path, nsid);
ccnt++;
}
--
2.13.7
next prev parent reply other threads:[~2019-07-12 0:31 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 0:31 [PATCH rfc v2 00/10] nvme-cli: nvmf auto-connect scripts James Smart
2019-07-12 0:31 ` [PATCH rfc v2 01/10] nvme-cli: ignore arguments that pass in "none" James Smart
2019-07-12 0:31 ` [PATCH rfc v2 02/10] nvme-cli: support persistent connections to a discovery controller James Smart
2019-07-12 0:31 ` [PATCH rfc v2 03/10] nvme-cli: allow discover to address discovery controller by persistent name James Smart
2019-07-12 1:34 ` Minwoo Im
2019-07-12 12:41 ` Hannes Reinecke
2019-07-12 16:37 ` Sagi Grimberg
2019-07-12 0:31 ` James Smart [this message]
2019-07-12 0:50 ` [PATCH rfc v2 04/10] nvme-cli: Refactor to create a get_nvme_ctrl_info routine Sagi Grimberg
2019-07-12 6:20 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 05/10] nvme-cli: extend ctrl_list_item for connect attributes James Smart
2019-07-12 0:47 ` Sagi Grimberg
2019-07-16 0:11 ` James Smart
2019-07-16 1:13 ` Sagi Grimberg
2019-07-12 6:24 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 06/10] nvme-cli: Add routine to compare ctrl_list_item to connect args James Smart
2019-07-12 0:49 ` Sagi Grimberg
2019-07-12 6:25 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 07/10] nvme-cli: Add routine to search for controller with specific attributes James Smart
2019-07-12 0:50 ` Sagi Grimberg
2019-07-12 6:28 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 08/10] nvme-cli: Expand --device argument processing James Smart
2019-07-12 0:51 ` Sagi Grimberg
2019-07-12 14:10 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 09/10] nvme-cli: add --quiet option James Smart
2019-07-12 17:35 ` Sagi Grimberg
2019-07-14 14:49 ` James Smart
2019-07-15 23:34 ` James Smart
2019-07-12 0:31 ` [PATCH rfc v2 10/10] nvme-cli: nvmf auto-connect scripts James Smart
2019-07-12 0:42 ` Sagi Grimberg
2019-07-12 17:26 ` Sagi Grimberg
2019-07-14 14:47 ` James Smart
2019-07-15 17:20 ` Sagi Grimberg
2019-07-12 17:55 ` Sagi Grimberg
2019-07-14 14:49 ` James Smart
2019-07-12 17:58 ` Sagi Grimberg
2019-07-14 14:57 ` James Smart
2019-07-15 17:21 ` Sagi Grimberg
2019-07-15 19:04 ` James Smart
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=20190712003140.16221-5-jsmart2021@gmail.com \
--to=jsmart2021@gmail.com \
/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