4:17 a.m.
util_filter_walk() does the looping through of busses and regions. Removing
duplicate code in region ops and provide filter functions so we can
utilize util_filter_walk() and share common code.
Signed-off-by: Dave Jiang <dave.jiang(a)intel.com>
---
ndctl/region.c | 59 ++++++++++++++++++++++++++++++++++----------------------
util/filter.h | 6 ++++++
2 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/ndctl/region.c b/ndctl/region.c
index 9fc90808..be12a546 100644
--- a/ndctl/region.c
+++ b/ndctl/region.c
@@ -19,10 +19,7 @@
#include <util/parse-options.h>
#include <ndctl/libndctl.h>
-static struct {
- const char *bus;
- const char *type;
-} param;
+struct util_filter_params param;
static const struct option region_options[] = {
OPT_STRING('b', "bus", ¶m.bus, "bus-id",
@@ -92,33 +89,49 @@ static int region_action(struct ndctl_region *region, enum
device_action mode)
return 0;
}
+static bool filter_bus(struct ndctl_bus *bus, struct util_filter_ctx *ctx)
+{
+ return true;
+}
+
+static bool filter_region(struct ndctl_region *region,
+ struct util_filter_ctx *ctx)
+{
+ struct region_filter_arg *rfa = ctx->region;
+ int rc;
+
+ if (rfa->rc < 0)
+ return false;
+
+ rc = region_action(region, rfa->action);
+
+ if (rc == 0)
+ rfa->rc++;
+ else
+ rfa->rc = 0;
+
+ /* we don't need to fall through, can continue the loop */
+ return false;
+}
+
static int do_xable_region(const char *region_arg, enum device_action mode,
struct ndctl_ctx *ctx)
{
- int rc = -ENXIO, success = 0;
- struct ndctl_region *region;
- struct ndctl_bus *bus;
+ int rc = -ENXIO;
+ struct util_filter_ctx fctx = { 0 };
+ struct region_filter_arg rfa = { 0 };
if (!region_arg)
goto out;
- ndctl_bus_foreach(ctx, bus) {
- if (!util_bus_filter(bus, param.bus))
- continue;
-
- ndctl_region_foreach(bus, region) {
- const char *type = ndctl_region_get_type_name(region);
-
- if (param.type && strcmp(param.type, type) != 0)
- continue;
- if (!util_region_filter(region, region_arg))
- continue;
- if (region_action(region, mode) == 0)
- success++;
- }
- }
+ fctx.filter_bus = filter_bus;
+ fctx.filter_region = filter_region;
+ fctx.region = &rfa;
+ fctx.region->action = mode;
+ rc = util_filter_walk(ctx, &fctx, ¶m);
+ if (rc == 0)
+ rc = fctx.region->rc;
- rc = success;
out:
param.bus = NULL;
return rc;
diff --git a/util/filter.h b/util/filter.h
index ce3336a5..6c14a303 100644
--- a/util/filter.h
+++ b/util/filter.h
@@ -57,6 +57,11 @@ struct ndns_filter_arg {
int rc;
};
+struct region_filter_arg {
+ enum device_action action;
+ int rc;
+};
+
/*
* struct util_filter_ctx - control and callbacks for util_filter_walk()
* ->filter_bus() and ->filter_region() return bool because the
@@ -75,6 +80,7 @@ struct util_filter_ctx {
void *arg;
struct list_filter_arg *list;
struct ndns_filter_arg *ndns;
+ struct region_filter_arg *region;
};
};