Before open coding yet another translation between modes and their text name, introduce a util_nsmode() and util_nsmode_name() helpers.
Consolidate the existing mode_to_type() helper into the new common / public util. Signed-off-by: Dan Williams <[email protected]> --- ndctl/namespace.c | 39 +++++++-------------------------------- util/filter.c | 42 +++++++++++++++++++++++++++--------------- util/filter.h | 3 +++ 3 files changed, 37 insertions(+), 47 deletions(-) diff --git a/ndctl/namespace.c b/ndctl/namespace.c index f958726a994d..43a5fccac491 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -205,21 +205,7 @@ static int set_defaults(enum device_action mode) param.type = "pmem"; if (param.mode) { - if (strcmp(param.mode, "safe") == 0) - /* pass */; - else if (strcmp(param.mode, "sector") == 0) - param.mode = "safe"; /* pass */ - else if (strcmp(param.mode, "memory") == 0) - /* pass */; - else if (strcmp(param.mode, "fsdax") == 0) - param.mode = "memory"; /* pass */ - else if (strcmp(param.mode, "raw") == 0) - /* pass */; - else if (strcmp(param.mode, "dax") == 0) - /* pass */; - else if (strcmp(param.mode, "devdax") == 0) - param.mode = "dax"; /* pass */ - else { + if (util_nsmode(param.mode) == NDCTL_NS_MODE_UNKNOWN) { error("invalid mode '%s'\n", param.mode); rc = -EINVAL; } @@ -285,7 +271,7 @@ static int set_defaults(enum device_action mode) rc = -EINVAL; } } else if (((param.type && strcmp(param.type, "blk") == 0) - || (param.mode && strcmp(param.mode, "safe") == 0))) { + || util_nsmode(param.mode) == NDCTL_NS_MODE_SECTOR)) { /* default sector size for blk-type or safe-mode */ param.sector_size = "4096"; } @@ -559,23 +545,12 @@ static int validate_namespace_options(struct ndctl_region *region, } if (param.mode) { - if (strcmp(param.mode, "memory") == 0) - p->mode = NDCTL_NS_MODE_FSDAX; - else if (strcmp(param.mode, "sector") == 0) - p->mode = NDCTL_NS_MODE_SECTOR; - else if (strcmp(param.mode, "safe") == 0) - p->mode = NDCTL_NS_MODE_SECTOR; - else if (strcmp(param.mode, "dax") == 0) - p->mode = NDCTL_NS_MODE_DEVDAX; - else - p->mode = NDCTL_NS_MODE_RAW; - + p->mode = util_nsmode(param.mode); if (ndctl_region_get_type(region) != ND_DEVICE_REGION_PMEM && (p->mode == NDCTL_NS_MODE_FSDAX || p->mode == NDCTL_NS_MODE_DEVDAX)) { debug("blk %s does not support %s mode\n", region_name, - p->mode == NDCTL_NS_MODE_FSDAX - ? "fsdax" : "devdax"); + util_nsmode_name(p->mode)); return -EAGAIN; } } else if (ndns) @@ -593,7 +568,8 @@ static int validate_namespace_options(struct ndctl_region *region, } else if (p->mode == NDCTL_NS_MODE_DEVDAX) { dax = ndctl_region_get_dax_seed(region); if (!dax) { - error("Kernel does not support devdax mode\n"); + error("Kernel does not support %s mode\n", + util_nsmode_name(p->mode)); return -ENODEV; } } @@ -617,8 +593,7 @@ static int validate_namespace_options(struct ndctl_region *region, default: error("%s mode does not support setting an alignment\n", - p->mode == NDCTL_NS_MODE_SECTOR - ? "sector" : "raw"); + util_nsmode_name(p->mode)); return -ENXIO; } diff --git a/util/filter.c b/util/filter.c index ce6239fbac3b..e4b1885b26f8 100644 --- a/util/filter.c +++ b/util/filter.c @@ -335,29 +335,41 @@ struct daxctl_dev *util_daxctl_dev_filter(struct daxctl_dev *dev, return NULL; } -static enum ndctl_namespace_mode mode_to_type(const char *mode) +enum ndctl_namespace_mode util_nsmode(const char *mode) { if (!mode) - return -ENXIO; - + return NDCTL_NS_MODE_UNKNOWN; if (strcasecmp(mode, "memory") == 0) - return NDCTL_NS_MODE_MEMORY; - else if (strcasecmp(mode, "fsdax") == 0) - return NDCTL_NS_MODE_MEMORY; - else if (strcasecmp(mode, "sector") == 0) + return NDCTL_NS_MODE_FSDAX; + if (strcasecmp(mode, "fsdax") == 0) + return NDCTL_NS_MODE_FSDAX; + if (strcasecmp(mode, "sector") == 0) return NDCTL_NS_MODE_SECTOR; - else if (strcasecmp(mode, "safe") == 0) + if (strcasecmp(mode, "safe") == 0) return NDCTL_NS_MODE_SECTOR; - else if (strcasecmp(mode, "dax") == 0) - return NDCTL_NS_MODE_DAX; - else if (strcasecmp(mode, "devdax") == 0) - return NDCTL_NS_MODE_DAX; - else if (strcasecmp(mode, "raw") == 0) + if (strcasecmp(mode, "dax") == 0) + return NDCTL_NS_MODE_DEVDAX; + if (strcasecmp(mode, "devdax") == 0) + return NDCTL_NS_MODE_DEVDAX; + if (strcasecmp(mode, "raw") == 0) return NDCTL_NS_MODE_RAW; return NDCTL_NS_MODE_UNKNOWN; } +const char *util_nsmode_name(enum ndctl_namespace_mode mode) +{ + static const char *modes[] = { + [NDCTL_NS_MODE_FSDAX] = "fsdax", + [NDCTL_NS_MODE_DEVDAX] = "devdax", + [NDCTL_NS_MODE_RAW] = "raw", + [NDCTL_NS_MODE_SECTOR] = "sector", + [NDCTL_NS_MODE_UNKNOWN] = "unknown", + }; + + return modes[mode]; +} + int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx, struct util_filter_params *param) { @@ -380,7 +392,7 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx, type = ND_DEVICE_REGION_BLK; } - if (mode_to_type(param->mode) == NDCTL_NS_MODE_UNKNOWN) { + if (param->mode && util_nsmode(param->mode) == NDCTL_NS_MODE_UNKNOWN) { error("invalid mode: '%s'\n", param->mode); return -EINVAL; } @@ -458,7 +470,7 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx, continue; mode = ndctl_namespace_get_mode(ndns); - if (param->mode && mode_to_type(param->mode) != mode) + if (param->mode && util_nsmode(param->mode) != mode) continue; fctx->filter_namespace(ndns, fctx); diff --git a/util/filter.h b/util/filter.h index c2cdddf5be54..55f78f2a4cf7 100644 --- a/util/filter.h +++ b/util/filter.h @@ -38,6 +38,9 @@ struct ndctl_region *util_region_filter_by_namespace(struct ndctl_region *region struct daxctl_dev *util_daxctl_dev_filter(struct daxctl_dev *dev, const char *ident); +enum ndctl_namespace_mode util_nsmode(const char *mode); +const char *util_nsmode_name(enum ndctl_namespace_mode mode); + struct json_object; /* json object hierarchy for the util_filter_walk() performed by cmd_list() */ _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
