From patchwork Thu Apr 20 20:59:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9691337 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 9ECC2601D4 for ; Thu, 20 Apr 2017 21:05:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EC9C2780C for ; Thu, 20 Apr 2017 21:05:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83A2B28481; Thu, 20 Apr 2017 21:05:15 +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 4169C2780C for ; Thu, 20 Apr 2017 21:05:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 39DD021954084; Thu, 20 Apr 2017 14:05:15 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 2DB5021954068 for ; Thu, 20 Apr 2017 14:05:13 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2017 14:05:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,227,1488873600"; d="scan'208";a="76928937" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.125]) by orsmga002.jf.intel.com with ESMTP; 20 Apr 2017 14:05:12 -0700 Subject: [ndctl PATCH 4/5] test, libndctl: get ndctl_btt_get_size() on v4.8+ From: Dan Williams To: linux-nvdimm@lists.01.org Date: Thu, 20 Apr 2017 13:59:19 -0700 Message-ID: <149272195993.23427.16508179192531953920.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 went into the kernel with commit abe8b4e3cef8 "nvdimm, btt: add a size attribute for BTTs" Signed-off-by: Dan Williams --- test/libndctl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/libndctl.c b/test/libndctl.c index 38a0bb746905..0381ee2cdefb 100644 --- a/test/libndctl.c +++ b/test/libndctl.c @@ -970,6 +970,8 @@ static int check_pfn_create(struct ndctl_region *region, static int check_btt_size(struct ndctl_btt *btt) { + struct ndctl_ctx *ctx = ndctl_btt_get_ctx(btt); + struct ndctl_test *test = ndctl_get_private_data(ctx); struct ndctl_namespace *ndns = ndctl_btt_get_namespace(btt); unsigned long long ns_size = ndctl_namespace_get_size(ndns); unsigned long sect_size = ndctl_btt_get_sector_size(btt); @@ -1018,6 +1020,10 @@ static int check_btt_size(struct ndctl_btt *btt) return -ENXIO; } + /* prior to 4.8 btt devices did not have a size attribute */ + if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 8, 0))) + return 0; + expect = expect_table[size_select][sect_select]; actual = ndctl_btt_get_size(btt); if (expect != actual) {