From patchwork Mon Jan 29 20:22:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10190581 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 5D54560375 for ; Mon, 29 Jan 2018 20:22:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4048F28896 for ; Mon, 29 Jan 2018 20:22:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3405B2889E; Mon, 29 Jan 2018 20:22:49 +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 186D328896 for ; Mon, 29 Jan 2018 20:22:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3234921E48F20; Mon, 29 Jan 2018 12:17:13 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 701FF2215BD89 for ; Mon, 29 Jan 2018 12:17:10 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2018 12:22:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,432,1511856000"; d="scan'208";a="199746950" Received: from vverma7-desk1.lm.intel.com ([10.232.112.218]) by fmsmga006.fm.intel.com with ESMTP; 29 Jan 2018 12:22:44 -0800 From: Vishal Verma To: Subject: [ndctl PATCH] ndctl: fix the default BTT sector size for reconfig Date: Mon, 29 Jan 2018 13:22:36 -0700 Message-Id: <20180129202236.9744-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.14.3 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP reconfig attempted to reuse the 'previous' value for sector-size when reconfiguring to a BTT mode or blk type namespace, but this may not always be valid (for example when coming from a memory mode namespace). Instead, when reconfiguring to BTT or blk, always default to 4096 unless a sector size is explicitly provided. Cc: Dan Williams Reported-by: Ross Zwisler Tested-by: Dave Jiang Reviewed-by: Dave Jiang Signed-off-by: Vishal Verma Tested-by: Ross Zwisler --- ndctl/namespace.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ndctl/namespace.c b/ndctl/namespace.c index c793ba3..ceb9e7a 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -244,12 +244,10 @@ static int set_defaults(enum device_action mode) error("invalid sector size: %s\n", param.sector_size); rc = -EINVAL; } - } else if (!param.reconfig - && ((param.type && strcmp(param.type, "blk") == 0) - || (param.mode - && strcmp(param.mode, "safe") == 0))) { - /* default sector size for blk-type or safe-mode */ - param.sector_size = "4096"; + } else if (((param.type && strcmp(param.type, "blk") == 0) + || (param.mode && strcmp(param.mode, "safe") == 0))) { + /* default sector size for blk-type or safe-mode */ + param.sector_size = "4096"; } return rc;