From: Gao Xiang <hsiangkao@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>,
Eric Sandeen <sandeen@redhat.com>,
Dave Chinner <david@fromorbit.com>,
Gao Xiang <hsiangkao@redhat.com>
Subject: [PATCH v5 3/3] mkfs: make use of xfs_validate_stripe_factors()
Date: Fri, 9 Oct 2020 13:24:21 +0800 [thread overview]
Message-ID: <20201009052421.3328-4-hsiangkao@redhat.com> (raw)
In-Reply-To: <20201009052421.3328-1-hsiangkao@redhat.com>
Check stripe numbers in calc_stripe_factors() by using
xfs_validate_stripe_factors().
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
---
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 {
--
2.18.1
next prev parent reply other threads:[~2020-10-09 5:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 5:24 [PATCH v5 0/3] xfsprogs: consolidate stripe validation Gao Xiang
2020-10-09 5:24 ` [PATCH v5 1/3] libxfs: allow i18n to xfs printk Gao Xiang
2020-10-09 5:24 ` [PATCH v5 2/3] xfs: introduce xfs_validate_stripe_factors() Gao Xiang
2020-10-09 5:24 ` Gao Xiang [this message]
2020-10-12 13:06 ` [PATCH v5 3/3] mkfs: make use of xfs_validate_stripe_factors() Brian Foster
2020-10-12 14:07 ` Gao Xiang
2020-10-12 14:20 ` Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201009052421.3328-4-hsiangkao@redhat.com \
--to=hsiangkao@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).