From patchwork Tue Mar 8 23:36:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 8538371 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9878FC0553 for ; Tue, 8 Mar 2016 23:37:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D229D200E8 for ; Tue, 8 Mar 2016 23:37:31 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 03A2E20035 for ; Tue, 8 Mar 2016 23:37:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 886E21A1F3D; Tue, 8 Mar 2016 15:37:44 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ml01.01.org (Postfix) with ESMTP id 6F0EF1A1F3D for ; Tue, 8 Mar 2016 15:37:43 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 08 Mar 2016 15:37:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,558,1449561600"; d="scan'208";a="929731195" Received: from dwillia2-desk3.jf.intel.com ([10.54.39.14]) by orsmga002.jf.intel.com with ESMTP; 08 Mar 2016 15:37:25 -0800 Subject: [ndctl PATCH 6/8] ndctl: make test/dax-dev more robust From: Dan Williams To: linux-nvdimm@lists.01.org Date: Tue, 08 Mar 2016 15:36:59 -0800 Message-ID: <20160308233659.18628.6462.stgit@dwillia2-desk3.jf.intel.com> In-Reply-To: <20160308233628.18628.13786.stgit@dwillia2-desk3.jf.intel.com> References: <20160308233628.18628.13786.stgit@dwillia2-desk3.jf.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.17 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-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Accept a pfn-enabled configuration for the test device to make the test suite more reliable when restarting after a failure or forced termination. Signed-off-by: Dan Williams --- test/dax-dev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/dax-dev.c b/test/dax-dev.c index 074fc9616743..3209eb148ed9 100755 --- a/test/dax-dev.c +++ b/test/dax-dev.c @@ -32,6 +32,7 @@ static int emit_e820_device(int loglevel, struct ndctl_test *test) const char *bdev; struct ndctl_ctx *ctx; struct ndctl_bus *bus; + struct ndctl_pfn *pfn; struct ndctl_region *region; struct ndctl_namespace *ndns; enum ndctl_namespace_mode mode; @@ -61,7 +62,11 @@ static int emit_e820_device(int loglevel, struct ndctl_test *test) if (mode >= 0 && mode != NDCTL_NS_MODE_MEMORY) goto out; - bdev = ndctl_namespace_get_block_device(ndns); + pfn = ndctl_namespace_get_pfn(ndns); + if (pfn) + bdev = ndctl_pfn_get_block_device(pfn); + else + bdev = ndctl_namespace_get_block_device(ndns); if (!bdev) goto out;