From: Dave Jiang <dave.jiang@intel.com>
To: vishal.l.verma@intel.com, dan.j.williams@intel.com
Cc: linux-nvdimm@lists.01.org
Subject: [PATCH v3 1/4] ndctl: convert namespace actions to use util_filter_params
Date: Thu, 26 Apr 2018 11:17:08 -0700 [thread overview]
Message-ID: <152476662812.70161.4900273108048073021.stgit@djiang5-desk3.ch.intel.com> (raw)
In-Reply-To: <152476632250.70161.9698682147434730585.stgit@djiang5-desk3.ch.intel.com>
In preparation of moving to using util_filter_walk, moving parts of
namespace params to util_filter_params.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
ndctl/namespace.c | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/ndctl/namespace.c b/ndctl/namespace.c
index fe86d826..e61f500c 100644
--- a/ndctl/namespace.c
+++ b/ndctl/namespace.c
@@ -40,14 +40,11 @@ static struct parameters {
bool mode_default;
bool align_default;
bool autolabel;
- const char *bus;
const char *map;
- const char *type;
const char *uuid;
const char *name;
const char *size;
const char *mode;
- const char *region;
const char *reconfig;
const char *sector_size;
const char *align;
@@ -55,6 +52,8 @@ static struct parameters {
.autolabel = true,
};
+struct util_filter_params uf_param;
+
void builtin_xaction_namespace_reset(void)
{
/*
@@ -87,9 +86,9 @@ struct parsed_parameters {
}})
#define BASE_OPTIONS() \
-OPT_STRING('b', "bus", ¶m.bus, "bus-id", \
+OPT_STRING('b', "bus", &uf_param.bus, "bus-id", \
"limit namespace to a bus with an id or provider of <bus-id>"), \
-OPT_STRING('r', "region", ¶m.region, "region-id", \
+OPT_STRING('r', "region", &uf_param.region, "region-id", \
"limit namespace to a region with an id or name of <region-id>"), \
OPT_BOOLEAN('v', "verbose", &verbose, "emit extra debug messages to stderr")
@@ -108,7 +107,7 @@ OPT_STRING('M', "map", ¶m.map, "memmap-location", \
"specify 'mem' or 'dev' for the location of the memmap"), \
OPT_STRING('l', "sector-size", ¶m.sector_size, "lba-size", \
"specify the logical sector size in bytes"), \
-OPT_STRING('t', "type", ¶m.type, "type", \
+OPT_STRING('t', "type", &uf_param.type, "type", \
"specify the type of namespace to create 'pmem' or 'blk'"), \
OPT_STRING('a', "align", ¶m.align, "align", \
"specify the namespace alignment in bytes (default: 2M)"), \
@@ -148,18 +147,18 @@ static int set_defaults(enum device_action mode)
{
int rc = 0;
- if (param.type) {
- if (strcmp(param.type, "pmem") == 0)
+ if (uf_param.type) {
+ if (strcmp(uf_param.type, "pmem") == 0)
/* pass */;
- else if (strcmp(param.type, "blk") == 0)
+ else if (strcmp(uf_param.type, "blk") == 0)
/* pass */;
else {
error("invalid type '%s', must be either 'pmem' or 'blk'\n",
- param.type);
+ uf_param.type);
rc = -EINVAL;
}
} else if (!param.reconfig && mode == ACTION_CREATE)
- param.type = "pmem";
+ uf_param.type = "pmem";
if (param.mode) {
if (strcmp(param.mode, "safe") == 0)
@@ -180,8 +179,8 @@ static int set_defaults(enum device_action mode)
error("invalid mode '%s'\n", param.mode);
rc = -EINVAL;
}
- } else if (!param.reconfig && param.type) {
- if (strcmp(param.type, "pmem") == 0)
+ } else if (!param.reconfig && uf_param.type) {
+ if (strcmp(uf_param.type, "pmem") == 0)
param.mode = "memory";
else
param.mode = "safe";
@@ -208,7 +207,7 @@ static int set_defaults(enum device_action mode)
param.map = "dev";
/* check for incompatible mode and type combinations */
- if (param.type && param.mode && strcmp(param.type, "blk") == 0
+ if (uf_param.type && param.mode && strcmp(uf_param.type, "blk") == 0
&& (strcmp(param.mode, "memory") == 0
|| strcmp(param.mode, "dax") == 0)) {
error("only 'pmem' namespaces support dax operation\n");
@@ -244,7 +243,7 @@ static int set_defaults(enum device_action mode)
error("invalid sector size: %s\n", param.sector_size);
rc = -EINVAL;
}
- } else if (((param.type && strcmp(param.type, "blk") == 0)
+ } else if (((uf_param.type && strcmp(uf_param.type, "blk") == 0)
|| (param.mode && strcmp(param.mode, "safe") == 0))) {
/* default sector size for blk-type or safe-mode */
param.sector_size = "4096";
@@ -1000,19 +999,19 @@ static int do_xaction_namespace(const char *namespace,
ndctl_set_log_priority(ctx, LOG_DEBUG);
ndctl_bus_foreach(ctx, bus) {
- if (!util_bus_filter(bus, param.bus))
+ if (!util_bus_filter(bus, uf_param.bus))
continue;
ndctl_region_foreach(bus, region) {
- if (!util_region_filter(region, param.region))
+ if (!util_region_filter(region, uf_param.region))
continue;
- if (param.type) {
- if (strcmp(param.type, "pmem") == 0
+ if (uf_param.type) {
+ if (strcmp(uf_param.type, "pmem") == 0
&& ndctl_region_get_type(region)
== ND_DEVICE_REGION_PMEM)
/* pass */;
- else if (strcmp(param.type, "blk") == 0
+ else if (strcmp(uf_param.type, "blk") == 0
&& ndctl_region_get_type(region)
== ND_DEVICE_REGION_BLK)
/* pass */;
@@ -1125,7 +1124,7 @@ int cmd_create_namespace(int argc, const char **argv, void *ctx)
* fallback to blk before giving up.
*/
memset(¶m, 0, sizeof(param));
- param.type = "blk";
+ uf_param.type = "blk";
set_defaults(ACTION_CREATE);
created = do_xaction_namespace(NULL, ACTION_CREATE, ctx);
}
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2018-04-26 18:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 18:17 [PATCH v3 0/4] convert actions to use util_filter_walk Dave Jiang
2018-04-26 18:17 ` Dave Jiang [this message]
2018-04-26 18:17 ` [PATCH v3 2/4] ndctl: convert namespace actions to use util_filter_walk() Dave Jiang
2018-04-27 0:44 ` Dan Williams
2018-04-26 18:17 ` [PATCH v3 3/4] ndctl: convert region " Dave Jiang
2018-04-26 18:17 ` [PATCH v3 4/4] ndctl: convert dimm " Dave Jiang
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=152476662812.70161.4900273108048073021.stgit@djiang5-desk3.ch.intel.com \
--to=dave.jiang@intel.com \
--cc=dan.j.williams@intel.com \
--cc=linux-nvdimm@lists.01.org \
--cc=vishal.l.verma@intel.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 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.