From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 24/42] mkfs: factor superblock feature validation
Date: Wed, 30 Aug 2017 09:50:34 +1000 [thread overview]
Message-ID: <20170829235052.21050-25-david@fromorbit.com> (raw)
In-Reply-To: <20170829235052.21050-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
---
mkfs/xfs_mkfs.c | 228 +++++++++++++++++++++++++++++++-------------------------
1 file changed, 127 insertions(+), 101 deletions(-)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 64542442148c..1c697dd5d4e1 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2090,6 +2090,130 @@ _("log stripe unit specified, using v2 logs\n"));
}
+/*
+ * Check that the incoming features make sense. The CLI structure was
+ * initialised with the default values before parsing, so we can just
+ * check it and copy it straight across to the cfg structure if it
+ * checks out.
+ */
+static void
+validate_sb_features(
+ struct mkfs_params *cfg,
+ struct cli_params *cli)
+{
+ /*
+ * Now we have blocks and sector sizes set up, check parameters that are
+ * no longer optional for CRC enabled filesystems. Catch them up front
+ * here before doing anything else.
+ */
+ if (cli->sb_feat.crcs_enabled) {
+ /* minimum inode size is 512 bytes, rest checked later */
+ if (cli->inodesize &&
+ cli->inodesize < (1 << XFS_DINODE_DFL_CRC_LOG)) {
+ fprintf(stderr,
+_("Minimum inode size for CRCs is %d bytes\n"),
+ 1 << XFS_DINODE_DFL_CRC_LOG);
+ usage();
+ }
+
+ /* inodes always aligned */
+ if (!cli->sb_feat.inode_align) {
+ fprintf(stderr,
+_("Inodes always aligned for CRC enabled filesytems\n"));
+ usage();
+ }
+
+ /* lazy sb counters always on */
+ if (!cli->sb_feat.lazy_sb_counters) {
+ fprintf(stderr,
+_("Lazy superblock counted always enabled for CRC enabled filesytems\n"));
+ usage();
+ }
+
+ /* version 2 logs always on */
+ if (cli->sb_feat.log_version != 2) {
+ fprintf(stderr,
+_("V2 logs always enabled for CRC enabled filesytems\n"));
+ usage();
+ }
+
+ /* attr2 always on */
+ if (cli->sb_feat.attr_version != 2) {
+ fprintf(stderr,
+_("V2 attribute format always enabled on CRC enabled filesytems\n"));
+ usage();
+ }
+
+ /* 32 bit project quota always on */
+ /* attr2 always on */
+ if (cli->sb_feat.projid16bit) {
+ fprintf(stderr,
+_("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
+ usage();
+ }
+
+ /* ftype always on */
+ if (!cli->sb_feat.dirftype) {
+ fprintf(stderr,
+_("Directory ftype field always enabled on CRC enabled filesytems\n"));
+ usage();
+ }
+
+ } else {
+ /*
+ * The kernel doesn't currently support crc=0,finobt=1
+ * filesystems. If crcs are not enabled and the user has not
+ * explicitly turned finobt on, then silently turn it off to
+ * avoid an unnecessary warning.
+ * If the user explicitly tried to use crc=0,finobt=1,
+ * then issue an error.
+ * The same is also for sparse inodes.
+ */
+ if (cli->sb_feat.finobt && cli_opt_set(&mopts, M_FINOBT)) {
+ fprintf(stderr,
+_("finobt not supported without CRC support\n"));
+ usage();
+ }
+ cli->sb_feat.finobt = false;
+
+ if (cli->sb_feat.spinodes) {
+ fprintf(stderr,
+_("sparse inodes not supported without CRC support\n"));
+ usage();
+ }
+ cli->sb_feat.spinodes = false;
+
+ if (cli->sb_feat.rmapbt) {
+ fprintf(stderr,
+_("rmapbt not supported without CRC support\n"));
+ usage();
+ }
+ cli->sb_feat.rmapbt = false;
+
+ if (cli->sb_feat.reflink) {
+ fprintf(stderr,
+_("reflink not supported without CRC support\n"));
+ usage();
+ }
+ cli->sb_feat.reflink = false;
+ }
+
+
+ if (cli->sb_feat.rmapbt && cli->xi->rtname) {
+ fprintf(stderr,
+_("rmapbt not supported with realtime devices\n"));
+ usage();
+ cli->sb_feat.rmapbt = false;
+ }
+
+ /*
+ * Copy features across to config structure now.
+ */
+ cfg->sb_feat = cli->sb_feat;
+ if (!platform_uuid_is_null(&cli->uuid))
+ platform_uuid_copy(&cfg->uuid, &cli->uuid);
+}
+
static void
print_mkfs_cfg(
struct mkfs_params *cfg,
@@ -2820,7 +2944,7 @@ main(
};
struct mkfs_params cfg = {};
- platform_uuid_generate(&uuid);
+ platform_uuid_generate(&cli.uuid);
progname = basename(argv[0]);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
@@ -3012,11 +3136,6 @@ main(
sb_feat = cli.sb_feat;
/* end temp don't break code */
- if (sb_feat.crcs_enabled && !sb_feat.dirftype) {
- fprintf(stderr, _("cannot disable ftype with crcs enabled\n"));
- usage();
- }
-
/*
* Extract as much of the valid config as we can from the CLI input
* before opening the libxfs devices.
@@ -3025,6 +3144,7 @@ main(
validate_sectorsize(&cfg, &cli, &dft, &ft, dfile, dry_run,
force_overwrite);
validate_log_sectorsize(&cfg, &cli, &dft);
+ validate_sb_features(&cfg, &cli);
/* temp don't break code */
sectorsize = cfg.sectorsize;
@@ -3034,103 +3154,9 @@ main(
lsectorsize = cfg.lsectorsize;
lsectorlog = cfg.lsectorlog;
sb_feat = cfg.sb_feat;
+ platform_uuid_copy(&uuid, &cfg.uuid);
/* end temp don't break code */
- /*
- * Now we have blocks and sector sizes set up, check parameters that are
- * no longer optional for CRC enabled filesystems. Catch them up front
- * here before doing anything else.
- */
- if (sb_feat.crcs_enabled) {
- /* minimum inode size is 512 bytes, ipflag checked later */
- if ((isflag || ilflag) && inodelog < XFS_DINODE_DFL_CRC_LOG) {
- fprintf(stderr,
-_("Minimum inode size for CRCs is %d bytes\n"),
- 1 << XFS_DINODE_DFL_CRC_LOG);
- usage();
- }
-
- /* inodes always aligned */
- if (!sb_feat.inode_align) {
- fprintf(stderr,
-_("Inodes always aligned for CRC enabled filesytems\n"));
- usage();
- }
-
- /* lazy sb counters always on */
- if (!sb_feat.lazy_sb_counters) {
- fprintf(stderr,
-_("Lazy superblock counted always enabled for CRC enabled filesytems\n"));
- usage();
- }
-
- /* version 2 logs always on */
- if (sb_feat.log_version != 2) {
- fprintf(stderr,
-_("V2 logs always enabled for CRC enabled filesytems\n"));
- usage();
- }
-
- /* attr2 always on */
- if (sb_feat.attr_version != 2) {
- fprintf(stderr,
-_("V2 attribute format always enabled on CRC enabled filesytems\n"));
- usage();
- }
-
- /* 32 bit project quota always on */
- /* attr2 always on */
- if (sb_feat.projid16bit) {
- fprintf(stderr,
-_("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
- usage();
- }
- } else {
- /*
- * The kernel doesn't currently support crc=0,finobt=1
- * filesystems. If crcs are not enabled and the user has not
- * explicitly turned finobt on, then silently turn it off to
- * avoid an unnecessary warning.
- * If the user explicitly tried to use crc=0,finobt=1,
- * then issue an error.
- * The same is also for sparse inodes.
- */
- if (sb_feat.finobt && mopts.subopt_params[M_FINOBT].seen) {
- fprintf(stderr,
-_("finobt not supported without CRC support\n"));
- usage();
- }
- sb_feat.finobt = 0;
-
- if (sb_feat.spinodes) {
- fprintf(stderr,
-_("sparse inodes not supported without CRC support\n"));
- usage();
- }
- sb_feat.spinodes = 0;
-
- if (sb_feat.rmapbt) {
- fprintf(stderr,
-_("rmapbt not supported without CRC support\n"));
- usage();
- }
- sb_feat.rmapbt = false;
-
- if (sb_feat.reflink) {
- fprintf(stderr,
-_("reflink not supported without CRC support\n"));
- usage();
- }
- sb_feat.reflink = false;
- }
-
-
- if (sb_feat.rmapbt && xi.rtname) {
- fprintf(stderr,
-_("rmapbt not supported with realtime devices\n"));
- usage();
- sb_feat.rmapbt = false;
- }
if (nsflag || nlflag) {
if (dirblocksize < blocksize ||
--
2.13.3
next prev parent reply other threads:[~2017-08-29 23:51 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 23:50 [PATCH 00/42] mkfs: factor the crap out of the code Dave Chinner
2017-08-29 23:50 ` [PATCH 01/42] mkfs: can't specify sector size of internal log Dave Chinner
2017-08-29 23:50 ` [PATCH 02/42] mkfs: make subopt table const Dave Chinner
2017-08-29 23:50 ` [PATCH 03/42] mkfs: introduce a structure to hold CLI options Dave Chinner
2017-08-29 23:50 ` [PATCH 04/42] mkfs: add generic subopt parsing table Dave Chinner
2017-08-29 23:50 ` [PATCH 05/42] mkfs: factor block subopts parser Dave Chinner
2017-08-29 23:50 ` [PATCH 06/42] mkfs: factor data " Dave Chinner
2017-08-29 23:50 ` [PATCH 07/42] mkfs: factor inode " Dave Chinner
2017-08-29 23:50 ` [PATCH 08/42] mkfs: factor log " Dave Chinner
2017-08-29 23:50 ` [PATCH 09/42] mkfs: factor meta " Dave Chinner
2017-08-29 23:50 ` [PATCH 10/42] mkfs: factor naming " Dave Chinner
2017-08-29 23:50 ` [PATCH 11/42] mkfs: factor rt " Dave Chinner
2017-08-29 23:50 ` [PATCH 12/42] mkfs: factor sector " Dave Chinner
2017-08-29 23:50 ` [PATCH 13/42] mkfs: Introduce mkfs configuration structure Dave Chinner
2017-08-29 23:50 ` [PATCH 14/42] mkfs: factor printing of mkfs config Dave Chinner
2017-08-29 23:50 ` [PATCH 15/42] mkfs: factor in memory superblock setup Dave Chinner
2017-08-29 23:50 ` [PATCH 16/42] mkfs: factor out device preparation Dave Chinner
2017-08-29 23:50 ` [PATCH 17/42] mkfs: factor writing AG headers Dave Chinner
2017-08-29 23:50 ` [PATCH 18/42] mkfs: factor secondary superblock updates Dave Chinner
2017-08-29 23:50 ` [PATCH 19/42] mkfs: introduce default configuration structure Dave Chinner
2017-08-29 23:50 ` [PATCH 20/42] mkfs: rename top level CLI parameters Dave Chinner
2017-08-29 23:50 ` [PATCH 21/42] mkfs: factor sectorsize validation Dave Chinner
2017-08-29 23:50 ` [PATCH 22/42] mkfs: factor blocksize validation Dave Chinner
2017-08-29 23:50 ` [PATCH 23/42] mkfs: factor log sector size validation Dave Chinner
2017-08-29 23:50 ` Dave Chinner [this message]
2017-08-29 23:50 ` [PATCH 25/42] mkfs: factor directory blocksize validation Dave Chinner
2017-08-29 23:50 ` [PATCH 26/42] mkfs: factor inode size validation Dave Chinner
2017-08-29 23:50 ` [PATCH 27/42] mkfs: factor out device size calculations Dave Chinner
2017-08-29 23:50 ` [PATCH 28/42] mkfs: fix hidden parameter in DTOBT() Dave Chinner
2017-08-29 23:50 ` [PATCH 29/42] mkfs: factor rtdev extent size validation Dave Chinner
2017-08-29 23:50 ` [PATCH 30/42] mkfs: rework stripe calculations Dave Chinner
2017-08-29 23:50 ` [PATCH 31/42] mkfs: factor device opening Dave Chinner
2017-08-29 23:50 ` [PATCH 32/42] mkfs: factor data device validation Dave Chinner
2017-08-29 23:50 ` [PATCH 33/42] mkfs: factor log " Dave Chinner
2017-08-29 23:50 ` [PATCH 34/42] mkfs: factor rt " Dave Chinner
2017-08-29 23:50 ` [PATCH 35/42] mkfs: factor AG geometry calculations Dave Chinner
2017-08-29 23:50 ` [PATCH 36/42] mkfs: factor AG alignment Dave Chinner
2017-08-30 23:44 ` Dave Chinner
2017-08-29 23:50 ` [PATCH 37/42] mkfs: rework imaxpct calculation Dave Chinner
2017-08-29 23:50 ` [PATCH 38/42] mkfs: factor initial mount setup Dave Chinner
2017-08-29 23:50 ` [PATCH 39/42] mkfs: factor log size calculations Dave Chinner
2017-09-05 5:23 ` Dave Chinner
2017-08-29 23:50 ` [PATCH 40/42] mkfs: cleanup redundant temporary code Dave Chinner
2017-08-29 23:50 ` [PATCH 41/42] mkfs: move error functions Dave Chinner
2017-08-29 23:50 ` [PATCH 42/42] mkfs: tidy up definitions Dave Chinner
2017-08-30 1:23 ` [PATCH 00/42] mkfs: factor the crap out of the code Darrick J. Wong
2017-08-30 1:57 ` Dave Chinner
2017-08-30 4:16 ` Luis R. Rodriguez
2017-08-30 5:44 ` Dave Chinner
2017-08-30 22:10 ` Luis R. Rodriguez
2017-08-30 23:22 ` Dave Chinner
2017-08-31 0:05 ` Luis R. Rodriguez
2017-08-31 16:23 ` Jan Tulak
2017-08-30 7:44 ` Martin Steigerwald
2017-09-04 12:31 ` Chandan Rajendra
2017-09-04 15:34 ` Eric Sandeen
2017-09-04 22:40 ` Dave Chinner
2017-09-07 10:31 ` Chandan Rajendra
2017-09-07 23:38 ` Dave Chinner
2017-09-09 10:24 ` Chandan Rajendra
2017-09-15 9:42 ` Jan Tulak
2017-09-16 11:29 ` Dave Chinner
2017-10-24 3:00 ` Eric Sandeen
2017-10-25 0:59 ` Dave Chinner
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=20170829235052.21050-25-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.