Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 193CB2222C22B for ; Fri, 26 Jan 2018 12:49:25 -0800 (PST) From: Ross Zwisler Subject: [ndctl PATCH v2 2/2] ndctl: add sector_size to 'ndctl list' output Date: Fri, 26 Jan 2018 13:54:49 -0700 Message-Id: <20180126205449.28693-1-ross.zwisler@linux.intel.com> In-Reply-To: <20180125232638.6585-2-ross.zwisler@linux.intel.com> References: <20180125232638.6585-2-ross.zwisler@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams , linux-nvdimm@lists.01.org, Dave Jiang List-ID: It used to be that the only PMEM namespaces with a variable sector size were ones with a BTT, but that has changed. sector_size still doesn't make sense for device DAX since we don't have a block I/O path. If we don't have a specified sector size, as happens with namespaces of devtype nd_namespace_io and older v1.1 namespace labels, we will display the default sector size of 512. Signed-off-by: Ross Zwisler --- util/json.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/util/json.c b/util/json.c index 95beaa2..647bf03 100644 --- a/util/json.c +++ b/util/json.c @@ -718,11 +718,6 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, goto err; json_object_object_add(jndns, "uuid", jobj); - jobj = json_object_new_int(ndctl_btt_get_sector_size(btt)); - if (!jobj) - goto err; - json_object_object_add(jndns, "sector_size", jobj); - bdev = ndctl_btt_get_block_device(btt); } else if (pfn) { ndctl_pfn_get_uuid(pfn, uuid); @@ -774,6 +769,24 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, } else bdev = ndctl_namespace_get_block_device(ndns); + jobj = NULL; + if (btt) { + jobj = json_object_new_int(ndctl_btt_get_sector_size(btt)); + if (!jobj) + goto err; + } else if (!dax) { + unsigned int sector_size = ndctl_namespace_get_sector_size(ndns); + + if (!sector_size) + sector_size = 512; + + jobj = json_object_new_int(sector_size); + if (!jobj) + goto err; + } + if (jobj) + json_object_object_add(jndns, "sector_size", jobj); + if (bdev && bdev[0]) { jobj = json_object_new_string(bdev); if (!jobj) -- 2.14.3 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm