From patchwork Thu Apr 20 20:59:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9691335 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 A43FA601D4 for ; Thu, 20 Apr 2017 21:05:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94A222780C for ; Thu, 20 Apr 2017 21:05:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8951B28481; Thu, 20 Apr 2017 21:05:09 +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 2AA262780C for ; Thu, 20 Apr 2017 21:05:09 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 23F6A21954074; Thu, 20 Apr 2017 14:05:09 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 7526621954068 for ; Thu, 20 Apr 2017 14:05:07 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2017 14:05:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,227,1488873600"; d="scan'208";a="79320701" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.125]) by orsmga004.jf.intel.com with ESMTP; 20 Apr 2017 14:05:07 -0700 Subject: [ndctl PATCH 3/5] test, libndctl: gate ndctl_namespace_get_mode() on v4.5+ From: Dan Williams To: linux-nvdimm@lists.01.org Date: Thu, 20 Apr 2017 13:59:14 -0700 Message-ID: <149272195485.23427.477956361004200064.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <149272193912.23427.11500536718990091103.stgit@dwillia2-desk3.amr.corp.intel.com> References: <149272193912.23427.11500536718990091103.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 This support was added upstream with commit 0731de0dd95b "libnvdimm, pfn: move 'memory mode' indication to sysfs". Signed-off-by: Dan Williams --- test/libndctl.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/libndctl.c b/test/libndctl.c index f5a6abe50edd..38a0bb746905 100644 --- a/test/libndctl.c +++ b/test/libndctl.c @@ -1033,6 +1033,8 @@ static int check_btt_size(struct ndctl_btt *btt) static int check_btt_create(struct ndctl_region *region, struct ndctl_namespace *ndns, struct namespace *namespace) { + struct ndctl_ctx *ctx = ndctl_region_get_ctx(region); + struct ndctl_test *test = ndctl_get_private_data(ctx); struct btt *btt_s = namespace->btt_settings; int i, fd, retry = 10; struct ndctl_btt *btt; @@ -1070,10 +1072,13 @@ static int check_btt_create(struct ndctl_region *region, struct ndctl_namespace goto err; } - mode = ndctl_namespace_get_mode(ndns); - if (mode >= 0 && mode != NDCTL_NS_MODE_SAFE) - fprintf(stderr, "%s: expected safe mode got: %d\n", - devname, mode); + /* prior to v4.5 the mode attribute did not exist */ + if (ndctl_test_attempt(test, KERNEL_VERSION(4, 5, 0))) { + mode = ndctl_namespace_get_mode(ndns); + if (mode >= 0 && mode != NDCTL_NS_MODE_SAFE) + fprintf(stderr, "%s: expected safe mode got: %d\n", + devname, mode); + } rc = check_btt_size(btt); if (rc)