From patchwork Thu May 11 22:01:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9723197 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 263CE601E7 for ; Thu, 11 May 2017 22:07:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AD3F28737 for ; Thu, 11 May 2017 22:07:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F6EB2873B; Thu, 11 May 2017 22:07:23 +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=-1.9 required=2.0 tests=BAYES_00, 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 9461328737 for ; Thu, 11 May 2017 22:07:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 84BFF21A0BA9E; Thu, 11 May 2017 15:07:22 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 239A621A16E28 for ; Thu, 11 May 2017 15:07:22 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP; 11 May 2017 15:07:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,326,1491289200"; d="scan'208";a="100478917" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.125]) by fmsmga005.fm.intel.com with ESMTP; 11 May 2017 15:07:21 -0700 Subject: [ndctl PATCH 1/4] util: mark badblocks helpers static From: Dan Williams To: linux-nvdimm@lists.01.org Date: Thu, 11 May 2017 15:01:30 -0700 Message-ID: <149454009049.30857.6643219237076670086.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP These helpers are only used internal to util/json.c. Signed-off-by: Dan Williams --- util/json.c | 6 +++--- util/json.h | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/util/json.c b/util/json.c index 0092017262bd..b2c84181cadb 100644 --- a/util/json.c +++ b/util/json.c @@ -356,7 +356,7 @@ static struct json_object *dev_badblocks_to_json(struct ndctl_region *region, return NULL; } -struct json_object *util_pfn_badblocks_to_json(struct ndctl_pfn *pfn, +static struct json_object *util_pfn_badblocks_to_json(struct ndctl_pfn *pfn, bool include_media_errors, unsigned int *bb_count) { struct ndctl_region *region = ndctl_pfn_get_region(pfn); @@ -374,7 +374,7 @@ struct json_object *util_pfn_badblocks_to_json(struct ndctl_pfn *pfn, include_media_errors, bb_count); } -struct json_object *util_btt_badblocks_to_json(struct ndctl_btt *btt, +static struct json_object *util_btt_badblocks_to_json(struct ndctl_btt *btt, bool include_media_errors, unsigned int *bb_count) { struct ndctl_region *region = ndctl_btt_get_region(btt); @@ -393,7 +393,7 @@ struct json_object *util_btt_badblocks_to_json(struct ndctl_btt *btt, include_media_errors, bb_count); } -struct json_object *util_dax_badblocks_to_json(struct ndctl_dax *dax, +static struct json_object *util_dax_badblocks_to_json(struct ndctl_dax *dax, bool include_media_errors, unsigned int *bb_count) { struct ndctl_region *region = ndctl_dax_get_region(dax); diff --git a/util/json.h b/util/json.h index b3bc2084b621..1a6caeeb6e9e 100644 --- a/util/json.h +++ b/util/json.h @@ -13,12 +13,6 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, bool include_idle, bool include_dax, bool include_media_errs); struct daxctl_region; struct daxctl_dev; -struct json_object *util_dax_badblocks_to_json(struct ndctl_dax *dax, - bool include_media_errors, unsigned int *bb_count); -struct json_object *util_pfn_badblocks_to_json(struct ndctl_pfn *pfn, - bool include_media_errors, unsigned int *bb_count); -struct json_object *util_btt_badblocks_to_json(struct ndctl_btt *btt, - bool include_media_errors, unsigned int *bb_count); struct json_object *util_region_badblocks_to_json(struct ndctl_region *region, bool include_media_errors, unsigned int *bb_count); struct json_object *util_daxctl_region_to_json(struct daxctl_region *region,