From patchwork Thu Apr 26 18:17:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10366623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A6AE0601BE for ; Thu, 26 Apr 2018 18:17:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98B57291B4 for ; Thu, 26 Apr 2018 18:17:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DA16291C3; Thu, 26 Apr 2018 18:17:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 439AB291B4 for ; Thu, 26 Apr 2018 18:17:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 39A5A203B9001; Thu, 26 Apr 2018 11:17:21 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=dave.jiang@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 1C4DA203B8FF3 for ; Thu, 26 Apr 2018 11:17:20 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2018 11:17:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,331,1520924400"; d="scan'208";a="51087961" Received: from djiang5-desk3.ch.intel.com ([143.182.136.93]) by orsmga001.jf.intel.com with ESMTP; 26 Apr 2018 11:17:19 -0700 Subject: [PATCH v3 3/4] ndctl: convert region actions to use util_filter_walk() From: Dave Jiang To: vishal.l.verma@intel.com, dan.j.williams@intel.com Date: Thu, 26 Apr 2018 11:17:18 -0700 Message-ID: <152476663889.70161.5817620258990809275.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <152476632250.70161.9698682147434730585.stgit@djiang5-desk3.ch.intel.com> References: <152476632250.70161.9698682147434730585.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP 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..be12a546 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; +} + +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; }; };