From patchwork Fri Oct 9 05:24:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 11824959 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B5D36CA for ; Fri, 9 Oct 2020 05:25:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D67FD22245 for ; Fri, 9 Oct 2020 05:25:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OWas2h+X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731154AbgJIFZO (ORCPT ); Fri, 9 Oct 2020 01:25:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44928 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730449AbgJIFZO (ORCPT ); Fri, 9 Oct 2020 01:25:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602221112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=e5YmFQloaORwYRu04FIstli5H1tapvDa7XT4/gY7lrs=; b=OWas2h+XgC6hem4qJyF8L0sLQvudGQze3JwvA5DnHsCnq6WJX6481EzBfo+D/WmCD0wi/d GVc8gYTIvQC4GsqPJ0iudB9egLNovlHQ5h/q+nwSEvSbZY6itgobI+hGjhNYkOD1MDJinY 6UZNG3M0chX9Pl4LUAlZsAd5GDkWJf8= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-jvOofVXJMaOXjf2AZilV8w-1; Fri, 09 Oct 2020 01:25:11 -0400 X-MC-Unique: jvOofVXJMaOXjf2AZilV8w-1 Received: by mail-pl1-f197.google.com with SMTP id b5so5374533plk.2 for ; Thu, 08 Oct 2020 22:25:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e5YmFQloaORwYRu04FIstli5H1tapvDa7XT4/gY7lrs=; b=TowH3vMnVauiHaD40MBm6n9ynIE9EnYyAj9NJ6sVQ0WjN7cr9HjTRyYFezNzC9oR+m D+Kwa/LJLbchgEGgd+RugaudX7h3aD82bzY+LbKuHJv+4Mkfd8R8Z4f3OmpJWbiRJgUf fS/SG2MLzokDCYMVHQ0qnNNUtTJ/bqFjJ3UWXAWOgIMYx4I5SL4QjGDYTiSgpPZipp45 Yp3W+oSO67dL+45aiejOWbMXLZJoGEZCnzqPaWpS+PtEsGL40CpnTrg+pKknmCmp2vO1 lOYUpxP8P9CqMy7cF2+nEaZcgoq+KzauJpd0JXlTRwSblVipSlpVZZ4OtN64/bHiCZqx haOw== X-Gm-Message-State: AOAM533jNh+dRmVPi8Pm6pwuUiHv/2x5mQ1KhLxziGnIk/jjQ1mDnjzp 9ilyR3JJbalnJ6e7UGcbjjL0HmIBQvm7cwytfkFV7EBsYvWgkIxj1qWZm+cFBUTj5xwXiuVClK2 A3Zapl/rmVl89eDJjngvb X-Received: by 2002:a17:902:7589:b029:d2:686a:4ede with SMTP id j9-20020a1709027589b02900d2686a4edemr10853847pll.45.1602221109908; Thu, 08 Oct 2020 22:25:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTtNWv2kuBiYG2mEAgvf1nyJmObhBFCbHLNVgVclqX4EgleYYkFeuRAMPJhW7fRwWf3HRCHA== X-Received: by 2002:a17:902:7589:b029:d2:686a:4ede with SMTP id j9-20020a1709027589b02900d2686a4edemr10853828pll.45.1602221109708; Thu, 08 Oct 2020 22:25:09 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p12sm9254042pgm.29.2020.10.08.22.25.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 22:25:09 -0700 (PDT) From: Gao Xiang To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Eric Sandeen , Dave Chinner , Gao Xiang Subject: [PATCH v5 1/3] libxfs: allow i18n to xfs printk Date: Fri, 9 Oct 2020 13:24:19 +0800 Message-Id: <20201009052421.3328-2-hsiangkao@redhat.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20201009052421.3328-1-hsiangkao@redhat.com> References: <20201009052421.3328-1-hsiangkao@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org In preparation to a common stripe validation helper, allow i18n to xfs_{notice,warn,err,alert} so xfsprogs can share code with kernel. Suggested-by: Dave Chinner Reviewed-by: Darrick J. Wong Signed-off-by: Gao Xiang --- libxfs/libxfs_priv.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 4356fa43..bd724c32 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -121,10 +121,10 @@ extern char *progname; extern void cmn_err(int, char *, ...); enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC }; -#define xfs_notice(mp,fmt,args...) cmn_err(CE_NOTE,fmt, ## args) -#define xfs_warn(mp,fmt,args...) cmn_err(CE_WARN,fmt, ## args) -#define xfs_err(mp,fmt,args...) cmn_err(CE_ALERT,fmt, ## args) -#define xfs_alert(mp,fmt,args...) cmn_err(CE_ALERT,fmt, ## args) +#define xfs_notice(mp,fmt,args...) cmn_err(CE_NOTE, _(fmt), ## args) +#define xfs_warn(mp,fmt,args...) cmn_err(CE_WARN, _(fmt), ## args) +#define xfs_err(mp,fmt,args...) cmn_err(CE_ALERT, _(fmt), ## args) +#define xfs_alert(mp,fmt,args...) cmn_err(CE_ALERT, _(fmt), ## args) #define xfs_buf_ioerror_alert(bp,f) ((void) 0); From patchwork Fri Oct 9 05:24:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 11824961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54EA2109B for ; Fri, 9 Oct 2020 05:25:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AC0622240 for ; Fri, 9 Oct 2020 05:25:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b6g7kpeJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731183AbgJIFZS (ORCPT ); Fri, 9 Oct 2020 01:25:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42571 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730449AbgJIFZR (ORCPT ); Fri, 9 Oct 2020 01:25:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602221116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=xulYLBULP8Nk/nf4mHgO/TqbRK1WjTSep+paJ2G1iPs=; b=b6g7kpeJGdNXn4am0dRjsCL9HmNfAn5bCEDLyaSDTTu6IwsQTIF8g9o+nmtPhwKuRrvNfl 4C3fjFBaS6F7zSiZwWiZNhW271Q9s+O0hG8JoMziQ5Dz56PRUr29viqVZ66nBGqbA7m87b 7orenSc0tbRCBIaMDIyXZXhRtcSYaL4= Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-9wjn9ydGOyaNlIM_7ZKkKg-1; Fri, 09 Oct 2020 01:25:14 -0400 X-MC-Unique: 9wjn9ydGOyaNlIM_7ZKkKg-1 Received: by mail-pg1-f200.google.com with SMTP id j13so5693326pgp.11 for ; Thu, 08 Oct 2020 22:25:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xulYLBULP8Nk/nf4mHgO/TqbRK1WjTSep+paJ2G1iPs=; b=hwoSxtSyG/v/QFPxd/yTGxnhwbRjnhOu8sgoPB80bie8t9zBJzY4huVc5iITS6gDIR HCSxru/S8ur7TRpS4gcibomi65Hrjd2YtEblYIZUmTThPIPL0PCox1EUh05IkVVhteSE Du736U2KoZMdwcC1fD+j7F+07mWD7e2q2EG7y83TIensLus+q7vGAcO7T7UB4xY7EPWL dS0PHjRYV7AXbjOO//zTZRm0go1YBhA7nnwyEkAkUW0GjxkqWXkS2W0UyQKcU/zJmxQZ JYDvVmfMamYtEymslFtT7ZURTk7CZ1tDUMOOKRoRO1H0MYNQhIuj1c+p2j2u81KGqF0O FEvw== X-Gm-Message-State: AOAM531ZwTxsC8qq0nAQOQBSZi/sThXVkeyMrOuD34PX90QWl5GPbPBn zoP1qOVMLo0ia6zhEr4NuTPR7fpbXotOwONvYxN3/8BaId3jB656PUtEj7qYqYzqOysHUrCnY/H QXDo8zqgDM6AgBCTgjNKR X-Received: by 2002:a17:90a:6f21:: with SMTP id d30mr2611770pjk.165.1602221113536; Thu, 08 Oct 2020 22:25:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytJ3iTNOqhul6SVGogVmBw7W64k6qqtNECtRkqoa9ueYKZMmlgsBRjRQMdBcRcsZ87Gn/dDw== X-Received: by 2002:a17:90a:6f21:: with SMTP id d30mr2611748pjk.165.1602221113332; Thu, 08 Oct 2020 22:25:13 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p12sm9254042pgm.29.2020.10.08.22.25.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 22:25:13 -0700 (PDT) From: Gao Xiang To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Eric Sandeen , Dave Chinner , Gao Xiang Subject: [PATCH v5 2/3] xfs: introduce xfs_validate_stripe_factors() Date: Fri, 9 Oct 2020 13:24:20 +0800 Message-Id: <20201009052421.3328-3-hsiangkao@redhat.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20201009052421.3328-1-hsiangkao@redhat.com> References: <20201009052421.3328-1-hsiangkao@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Introduce a common helper to consolidate stripe validation process. Also make kernel code xfs_validate_sb_common() use it first. Signed-off-by: Gao Xiang --- libxfs/xfs_sb.c | 65 ++++++++++++++++++++++++++++++++++++++++--------- libxfs/xfs_sb.h | 3 +++ 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c index 302eea16..0f2697ed 100644 --- a/libxfs/xfs_sb.c +++ b/libxfs/xfs_sb.c @@ -357,21 +357,18 @@ xfs_validate_sb_common( } } - if (sbp->sb_unit) { - if (!xfs_sb_version_hasdalign(sbp) || - sbp->sb_unit > sbp->sb_width || - (sbp->sb_width % sbp->sb_unit) != 0) { - xfs_notice(mp, "SB stripe unit sanity check failed"); - return -EFSCORRUPTED; - } - } else if (xfs_sb_version_hasdalign(sbp)) { + /* + * Either (sb_unit and !hasdalign) or (!sb_unit and hasdalign) + * would imply the image is corrupted. + */ + if (!sbp->sb_unit ^ !xfs_sb_version_hasdalign(sbp)) { xfs_notice(mp, "SB stripe alignment sanity check failed"); return -EFSCORRUPTED; - } else if (sbp->sb_width) { - xfs_notice(mp, "SB stripe width sanity check failed"); - return -EFSCORRUPTED; } + if (!xfs_validate_stripe_factors(mp, XFS_FSB_TO_B(mp, sbp->sb_unit), + XFS_FSB_TO_B(mp, sbp->sb_width), 0)) + return -EFSCORRUPTED; if (xfs_sb_version_hascrc(&mp->m_sb) && sbp->sb_blocksize < XFS_MIN_CRC_BLOCKSIZE) { @@ -1208,3 +1205,49 @@ xfs_sb_get_secondary( *bpp = bp; return 0; } + +/* + * sunit, swidth, sectorsize(optional with 0) should be all in bytes, + * so users won't be confused by values in error messages. + */ +bool +xfs_validate_stripe_factors( + struct xfs_mount *mp, + __s64 sunit, + __s64 swidth, + int sectorsize) +{ + if (sectorsize && sunit % sectorsize) { + xfs_notice(mp, +"stripe unit (%lld) must be a multiple of the sector size (%d)", + sunit, sectorsize); + return false; + } + + if (sunit && !swidth) { + xfs_notice(mp, +"invalid stripe unit (%lld) and stripe width of 0", sunit); + return false; + } + + if (!sunit && swidth) { + xfs_notice(mp, +"invalid stripe width (%lld) and stripe unit of 0", swidth); + return false; + } + + if (sunit > swidth) { + xfs_notice(mp, +"stripe unit (%lld) is larger than the stripe width (%lld)", sunit, swidth); + return false; + } + + if (sunit && (swidth % sunit)) { + xfs_notice(mp, +"stripe width (%lld) must be a multiple of the stripe unit (%lld)", + swidth, sunit); + return false; + } + return true; +} + diff --git a/libxfs/xfs_sb.h b/libxfs/xfs_sb.h index 92465a9a..2d3504eb 100644 --- a/libxfs/xfs_sb.h +++ b/libxfs/xfs_sb.h @@ -42,4 +42,7 @@ extern int xfs_sb_get_secondary(struct xfs_mount *mp, struct xfs_trans *tp, xfs_agnumber_t agno, struct xfs_buf **bpp); +extern bool xfs_validate_stripe_factors(struct xfs_mount *mp, + __s64 sunit, __s64 swidth, int sectorsize); + #endif /* __XFS_SB_H__ */ From patchwork Fri Oct 9 05:24:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 11824963 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BAE66CA for ; Fri, 9 Oct 2020 05:25:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 040E521D46 for ; Fri, 9 Oct 2020 05:25:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P4DwrEON" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731213AbgJIFZX (ORCPT ); Fri, 9 Oct 2020 01:25:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44848 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731210AbgJIFZX (ORCPT ); Fri, 9 Oct 2020 01:25:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602221121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=Ax4NP2o3MiPQJzqLzjtAo8mf5CCCLgdZdynuD9wNouQ=; b=P4DwrEONIoFBqV3ALbkFhcmM+cMfNhSBbbSWbXIexEiSzSh8SSI899epPupzxkJP6P8g/X lyrbIRBJUMjIWVhMsPFTefQmf5EbdqkEBdPkL3mjNYGPW2jc2u3aMTMdAT2r6ui9wSerht Q1dYjeXPR6eNyLT7t6Li4DcKa3HCs1c= Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-498-3ygZGsKcMiCd3Zc5qrR3Cg-1; Fri, 09 Oct 2020 01:25:18 -0400 X-MC-Unique: 3ygZGsKcMiCd3Zc5qrR3Cg-1 Received: by mail-pg1-f197.google.com with SMTP id e28so5725285pgm.15 for ; Thu, 08 Oct 2020 22:25:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ax4NP2o3MiPQJzqLzjtAo8mf5CCCLgdZdynuD9wNouQ=; b=EE4/c0yppz+O+nwJ1yepzGLxhmInFSKfs0PiWZWi+QCd1YltvdLaV2A+zWztO3WNvG Nb4D1KXyeSMWh6YoAc+zgjTcpG7LnxytZfNsOcSTfS8Hpa0G6TTPQmFJdMWDJkSJVFCc ue6r607L1DXOvr7+u7JtEOZvtE2Br+9/L2lZzxI3uoLGx2CgShDKcogmw4I4SO7iT9WK mjuPmUUjTEyJssCs13gEPkKYyrGKWV8M30lAzQ8uqVRFKYo+JgUnatYhbbUfUa3Ww4iR XHVXzmyaWibG3xAlaO7vyUIEu/9OyblqnqIqOenYamHVnxm1ZG9wW4J61x1kzg/1JE1S 3K9g== X-Gm-Message-State: AOAM531YQdGf3eaAYW575GyTJ8p57NLSY28bxQJCYWR3BmUP1Nxc42EP OGF78KTF/wmJAt9dA/koz1/MrMw48zoUNyK0ctl1DNlS1w8scxGdw5Bbx28+vwOC0pLR61bnW0r ntBY+NRolJoUvFR/RVJGY X-Received: by 2002:a17:902:8c8b:b029:d2:6356:8b43 with SMTP id t11-20020a1709028c8bb02900d263568b43mr10819424plo.34.1602221117527; Thu, 08 Oct 2020 22:25:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8T0pm2ez2SHuMzuV0SB/rkJCzPK59voufeeSIQs/LkqkjsgBB5ZQaDdAa5dD+iYFuPtInwg== X-Received: by 2002:a17:902:8c8b:b029:d2:6356:8b43 with SMTP id t11-20020a1709028c8bb02900d263568b43mr10819405plo.34.1602221117305; Thu, 08 Oct 2020 22:25:17 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p12sm9254042pgm.29.2020.10.08.22.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 22:25:17 -0700 (PDT) From: Gao Xiang To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Eric Sandeen , Dave Chinner , Gao Xiang Subject: [PATCH v5 3/3] mkfs: make use of xfs_validate_stripe_factors() Date: Fri, 9 Oct 2020 13:24:21 +0800 Message-Id: <20201009052421.3328-4-hsiangkao@redhat.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20201009052421.3328-1-hsiangkao@redhat.com> References: <20201009052421.3328-1-hsiangkao@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Check stripe numbers in calc_stripe_factors() by using xfs_validate_stripe_factors(). Signed-off-by: Gao Xiang --- libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index e7e42e93..c1b009c1 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -188,6 +188,7 @@ #define xfs_trans_roll_inode libxfs_trans_roll_inode #define xfs_trans_roll libxfs_trans_roll +#define xfs_validate_stripe_factors libxfs_validate_stripe_factors #define xfs_verify_agbno libxfs_verify_agbno #define xfs_verify_agino libxfs_verify_agino #define xfs_verify_cksum libxfs_verify_cksum diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 8fe149d7..5ce063ae 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2305,12 +2305,6 @@ _("both data su and data sw options must be specified\n")); usage(); } - if (dsu % cfg->sectorsize) { - fprintf(stderr, -_("data su must be a multiple of the sector size (%d)\n"), cfg->sectorsize); - usage(); - } - dsunit = (int)BTOBBT(dsu); big_dswidth = (long long int)dsunit * dsw; if (big_dswidth > INT_MAX) { @@ -2322,13 +2316,9 @@ _("data stripe width (%lld) is too large of a multiple of the data stripe unit ( dswidth = big_dswidth; } - if ((dsunit && !dswidth) || (!dsunit && dswidth) || - (dsunit && (dswidth % dsunit != 0))) { - fprintf(stderr, -_("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"), - dswidth, dsunit); + if (!libxfs_validate_stripe_factors(NULL, BBTOB(dsunit), BBTOB(dswidth), + cfg->sectorsize)) usage(); - } /* If sunit & swidth were manually specified as 0, same as noalign */ if ((cli_opt_set(&dopts, D_SUNIT) || cli_opt_set(&dopts, D_SU)) && @@ -2344,11 +2334,12 @@ _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"), /* if no stripe config set, use the device default */ if (!dsunit) { - /* Ignore nonsense from device. XXX add more validation */ - if (ft->dsunit && ft->dswidth == 0) { + /* Ignore nonsense from device report. */ + if (!libxfs_validate_stripe_factors(NULL, BBTOB(ft->dsunit), + BBTOB(ft->dswidth), 0)) { fprintf(stderr, -_("%s: Volume reports stripe unit of %d bytes and stripe width of 0, ignoring.\n"), - progname, BBTOB(ft->dsunit)); +_("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\n"), + progname, BBTOB(ft->dsunit), BBTOB(ft->dswidth)); ft->dsunit = 0; ft->dswidth = 0; } else {