From patchwork Mon Nov 4 20:08:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 11226379 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E8C5C14E5 for ; Mon, 4 Nov 2019 20:08:27 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 973E920869 for ; Mon, 4 Nov 2019 20:08:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 973E920869 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 7FEEC100EA540; Mon, 4 Nov 2019 12:11:15 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=vishal.l.verma@intel.com; receiver= 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 7F0A7100EEBB5 for ; Mon, 4 Nov 2019 12:11:13 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2019 12:08:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,268,1569308400"; d="scan'208";a="195567311" Received: from vverma7-desk1.amr.corp.intel.com (HELO vverma7-desk1.lm.intel.com) ([10.232.112.164]) by orsmga008.jf.intel.com with ESMTP; 04 Nov 2019 12:08:24 -0800 From: Vishal Verma To: Subject: [ndctl PATCH v2 1/2] ndctl/namespace: remove open coded is_namespace_active() Date: Mon, 4 Nov 2019 13:08:21 -0700 Message-Id: <20191104200822.28959-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Message-ID-Hash: ASQTANUEOUW7HFARO6UQAUFLGSMX7WDB X-Message-ID-Hash: ASQTANUEOUW7HFARO6UQAUFLGSMX7WDB X-MailFrom: vishal.l.verma@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: "Aneesh Kumar K.V" X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Replace the open coded namespace active check with the one provided by libndctl - ndctl_namespace_is_active(). is_namespace_active() additionally checked for a non-NULL 'ndns', which the libndctl API doesn't do. However, all the callers either performed that check themselves, or made prior assumptions about ndns being valid by dereferencing it earlier. Cc: Dan Williams Signed-off-by: Vishal Verma --- ndctl/namespace.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ndctl/namespace.c b/ndctl/namespace.c index 7fb0007..ccd46d0 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -453,14 +453,6 @@ static int setup_namespace(struct ndctl_region *region, return rc; } -static int is_namespace_active(struct ndctl_namespace *ndns) -{ - return ndns && (ndctl_namespace_is_enabled(ndns) - || ndctl_namespace_get_pfn(ndns) - || ndctl_namespace_get_dax(ndns) - || ndctl_namespace_get_btt(ndns)); -} - /* * validate_namespace_options - init parameters for setup_namespace * @region: parent of the namespace to create / reconfigure @@ -787,7 +779,7 @@ static struct ndctl_namespace *region_get_namespace(struct ndctl_region *region) /* prefer the 0th namespace if it is idle */ ndctl_namespace_foreach(region, ndns) if (ndctl_namespace_get_id(ndns) == 0 - && !is_namespace_active(ndns)) + && !ndctl_namespace_is_active(ndns)) return ndns; return ndctl_region_get_namespace_seed(region); } @@ -827,7 +819,7 @@ static int namespace_create(struct ndctl_region *region) p.size = available; ndns = region_get_namespace(region); - if (!ndns || is_namespace_active(ndns)) { + if (!ndns || ndctl_namespace_is_active(ndns)) { debug("%s: no %s namespace seed\n", devname, ndns ? "idle" : "available"); return -EAGAIN; @@ -1074,7 +1066,7 @@ static int namespace_reconfig(struct ndctl_region *region, } ndns = region_get_namespace(region); - if (!ndns || is_namespace_active(ndns)) { + if (!ndns || !ndctl_namespace_is_active(ndns)) { debug("%s: no %s namespace seed\n", ndctl_region_get_devname(region), ndns ? "idle" : "available");