From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 646D820352AB2 for ; Wed, 9 May 2018 16:17:54 -0700 (PDT) From: "Verma, Vishal L" Subject: Re: [PATCH v5 3/4] ndctl: convert region actions to use util_filter_walk() Date: Wed, 9 May 2018 23:17:51 +0000 Message-ID: <1525907870.4429.3.camel@intel.com> References: <152486678857.66587.12260245215754521561.stgit@djiang5-desk3.ch.intel.com> <152486690886.66587.10650176680608823926.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <152486690886.66587.10650176680608823926.stgit@djiang5-desk3.ch.intel.com> Content-Language: en-US Content-ID: MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: "Williams, Dan J" , "Jiang, Dave" Cc: "linux-nvdimm@lists.01.org" List-ID: On Fri, 2018-04-27 at 15:08 -0700, Dave Jiang wrote: > 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 > --- > 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..9fd07af6 100644 > --- a/ndctl/region.c > +++ b/ndctl/region.c > @@ -19,10 +19,7 @@ > #include > #include > > -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; > +} > + Instead of creating these trivial functions everywhere (also applies to namespaces.c, dimm.c), should we just leave fctx.bus_filter NULL. And fix util_filter_walk to check for fctx->ptr != NULL any time it calls one of the functions.. > +static bool filter_region(struct ndctl_region *region, > + struct util_filter_ctx *ctx) > +{ > + struct rgaction_filter_arg *rfa = ctx->rgaction; > + 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 rgaction_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.rgaction = &rfa; > + fctx.rgaction->action = mode; > + rc = util_filter_walk(ctx, &fctx, ¶m); > + if (rc == 0) > + rc = fctx.rgaction->rc; > > - rc = success; > out: > param.bus = NULL; > return rc; > diff --git a/util/filter.h b/util/filter.h > index 9f3786a9..0e0e3bec 100644 > --- a/util/filter.h > +++ b/util/filter.h > @@ -57,6 +57,11 @@ struct nsaction_filter_arg { > int rc; > }; > > +struct rgaction_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 nsaction_filter_arg *nsaction; > + struct rgaction_filter_arg *rgaction; > }; > }; > > _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm