xfs
[Top] [All Lists]

[PATCH 1/4] mkfs.xfs: validate options for CRCs up front.

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/4] mkfs.xfs: validate options for CRCs up front.
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Mon, 27 May 2013 17:14:53 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1369638896-24872-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1369312565-6266-1-git-send-email-david@xxxxxxxxxxxxx> <1369638896-24872-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

With CRC enabled filesystems, certain options are now not optional
and so are always enabled. Validate these options up front and
abort if options are specified that cannot be set.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 mkfs/xfs_mkfs.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 291bab4..dad7dab 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1476,6 +1476,7 @@ main(
                                        if (c < 0 || c > 1)
                                                illegal(value, "m crc");
                                        crcs_enabled = c;
+                                       projid32bit = 1;
                                        break;
                                default:
                                        unknown('m', value);
@@ -1754,6 +1755,57 @@ _("block size %d cannot be smaller than logical sector 
size %d\n"),
                logversion = 2;
        }
 
+       /*
+        * 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 (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 (iaflag != 1) {
+                       fprintf(stderr,
+_("Inodes always aligned for CRC enabled filesytems\n"));
+                       usage();
+               }
+
+               /* lazy sb counters always on */
+               if (lazy_sb_counters != 1) {
+                       fprintf(stderr,
+_("Lazy superblock counted always enabled for CRC enabled filesytems\n"));
+                       usage();
+               }
+
+               /* version 2 logs always on */
+               if (logversion != 2) {
+                       fprintf(stderr,
+_("V2 logs always enabled for CRC enabled filesytems\n"));
+                       usage();
+               }
+
+               /* attr2 always on */
+               if (attrversion != 2) {
+                       fprintf(stderr,
+_("V2 attribute format always enabled on CRC enabled filesytems\n"));
+                       usage();
+               }
+
+               /* 32 bit project quota always on */
+               /* attr2 always on */
+               if (projid32bit != 1) {
+                       fprintf(stderr,
+_("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
+                       usage();
+               }
+       }
+
        if (nsflag || nlflag) {
                if (dirblocksize < blocksize ||
                                        dirblocksize > XFS_MAX_BLOCKSIZE) {
-- 
1.7.10.4

<Prev in Thread] Current Thread [Next in Thread>