xfsprog: add mkfs.xfs sb v4 support for dirent filetype field

Add directory inode type feature to mkfs.xfs and its manual page.

In sb v4, "mkfs.xfs -n ftype=1" turns on the feature.

The feature is automatically turned on for "-m crc=1", but reject
the use of the "-n ftype=0|1" with the "-m crc=1" option.

Signed-off-by: Mark Tinguely <tinguely@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8
index d46b3ef431abeae8297db526d4c3d1ab775740f7..8184e10d41fe23456d1f37a40684cc07bd435ea1 100644 (file)
--- a/man/man8/mkfs.xfs.8
+++ b/man/man8/mkfs.xfs.8
@@ -518,6 +518,25 @@ option enables ASCII only case-insensitive filename lookup and version
 are stored in directories using the case they were created with.
 .IP
 Note: Version 1 directories are not supported.
+.TP
+.BI ftype= value
+This feature allows the inode type to be stored in the directory
+structure so that the
+.BR readdir (3)
+and
+.BR getdents (2)
+do not need to look up the inode to determine the inode type.
+
+The
+.I value
+is either 0 or 1, with 1 signifiying that filetype information
+will be stored in the directory structure. The default value is 0.
+
+When CRCs are enabled via
+.B \-m crc=1,
+the ftype functionality is always enabled. This feature can not be turned
+off for such filesystem configurations.
+.IP
 .RE
 .TP
 .BI \-p " protofile"

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 9da54f2fa299d4d3e99cd1bba619a5a891b021ab..355708c99dd3408a2d1d955a722530a8c82c3dee 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -147,6 +147,8 @@ char        *nopts[] = {
        "size",
 #define        N_VERSION       2
        "version",
+#define        N_FTYPE         3
+       "ftype",
        NULL,
 };
 
@@ -885,6 +887,7 @@ main(
        char                    *dfile;
        int                     dirblocklog;
        int                     dirblocksize;
+       int                     dirftype;
        int                     dirversion;
        char                    *dsize;
        int                     dsu;
@@ -930,6 +933,7 @@ main(
        int                     nodsflag;
        int                     norsflag;
        xfs_alloc_rec_t         *nrec;
+       int                     nftype;
        int                     nsflag;
        int                     nvflag;
        int                     nci;
@@ -977,6 +981,7 @@ main(
        logversion = 2;
        logagno = logblocks = rtblocks = rtextblocks = 0;
        Nflag = nlflag = nsflag = nvflag = nci = 0;
+       nftype = dirftype = 0;          /* inode type information in the dir */
        dirblocklog = dirblocksize = 0;
        dirversion = XFS_DFL_DIR_VERSION;
        qflag = 0;
@@ -1475,6 +1480,11 @@ main(
                                        if (c < 0 || c > 1)
                                                illegal(value, "m crc");
                                        crcs_enabled = c;
+                                       if (nftype && crcs_enabled) {
+                                               fprintf(stderr,
+_("cannot specify both crc and ftype\n"));
+                                               usage();
+                                       }
                                        break;
                                default:
                                        unknown('m', value);
@@ -1533,6 +1543,19 @@ main(
                                        }
                                        nvflag = 1;
                                        break;
+                               case N_FTYPE:
+                                       if (!value || *value == '\0')
+                                               reqval('n', nopts, N_FTYPE);
+                                       if (nftype)
+                                               respec('n', nopts, N_FTYPE);
+                                       dirftype = atoi(value);
+                                       if (crcs_enabled) {
+                                               fprintf(stderr,
+_("cannot specify both crc and ftype\n"));
+                                               usage();
+                                       }
+                                       nftype = 1;
+                                       break;
                                default:
                                        unknown('n', value);
                                }
@@ -2434,6 +2457,14 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
        }
        validate_log_size(logblocks, blocklog, min_logblocks);
 
+       /*
+        * dirent filetype field always enabled on v5 superblocks
+        */
+       if (crcs_enabled) {
+               sbp->sb_features_incompat = XFS_SB_FEAT_INCOMPAT_FTYPE;
+               dirftype = 1;
+       }
+
        if (!qflag || Nflag) {
                printf(_(
                   "meta-data=%-22s isize=%-6d agcount=%lld, agsize=%lld blks\n"
@@ -2441,7 +2472,7 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
                   "         =%-22s crc=%u\n"
                   "data     =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n"
                   "         =%-22s sunit=%-6u swidth=%u blks\n"
-                  "naming   =version %-14u bsize=%-6u ascii-ci=%d\n"
+                  "naming   =version %-14u bsize=%-6u ascii-ci=%d ftype=%d\n"
                   "log      =%-22s bsize=%-6d blocks=%lld, version=%d\n"
                   "         =%-22s sectsz=%-5u sunit=%d blks, lazy-count=%d\n"
                   "realtime =%-22s extsz=%-6d blocks=%lld, rtextents=%lld\n"),
@@ -2450,7 +2481,7 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
                        "", crcs_enabled,
                        "", blocksize, (long long)dblocks, imaxpct,
                        "", dsunit, dswidth,
-                       dirversion, dirblocksize, nci,
+                       dirversion, dirblocksize, nci, dirftype,
                        logfile, 1 << blocklog, (long long)logblocks,
                        logversion, "", lsectorsize, lsunit, lazy_sb_counters,
                        rtfile, rtextblocks << blocklog,
@@ -2512,21 +2543,16 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
                sbp->sb_logsectlog = 0;
                sbp->sb_logsectsize = 0;
        }
+
        sbp->sb_features2 = XFS_SB_VERSION2_MKFS(crcs_enabled, lazy_sb_counters,
-                                       attrversion == 2, !projid16bit, 0);
+                                  attrversion == 2, !projid16bit, 0,
+                                  (!crcs_enabled && dirftype));
        sbp->sb_versionnum = XFS_SB_VERSION_MKFS(crcs_enabled, iaflag,
                                        dsunit != 0,
                                        logversion == 2, attrversion == 1,
                                        (sectorsize != BBSIZE ||
                                                        lsectorsize != BBSIZE),
                                        nci, sbp->sb_features2 != 0);
-       /*
-        * dirent filetype field always enabled on v5 superblocks
-        */
-       if (crcs_enabled) {
-               sbp->sb_features_incompat = XFS_SB_FEAT_INCOMPAT_FTYPE;
-       }
-
        /*
         * Due to a structure alignment issue, sb_features2 ended up in one
         * of two locations, the second "incorrect" location represented by
@@ -3065,7 +3091,7 @@ usage( void )
                            sunit=value|su=num,sectlog=n|sectsize=num,\n\
                            lazy-count=0|1]\n\
 /* label */            [-L label (maximum 12 characters)]\n\
-/* naming */           [-n log=n|size=num,version=2|ci]\n\
+/* naming */           [-n log=n|size=num,version=2|ci,ftype=0|1]\n\
 /* no-op info only */  [-N]\n\
 /* prototype file */   [-p fname]\n\
 /* quiet */            [-q]\n\

diff --git a/mkfs/xfs_mkfs.h b/mkfs/xfs_mkfs.h
index 1393feb61c2a183a088faad5abec9bc59ad3d01a..9df5f376051aae0bd57cd6f3b59c42a668b04e49 100644 (file)
--- a/mkfs/xfs_mkfs.h
+++ b/mkfs/xfs_mkfs.h
@@ -36,12 +36,14 @@
                XFS_DFL_SB_VERSION_BITS |                               \
        0 ) : XFS_SB_VERSION_1 )
 
-#define XFS_SB_VERSION2_MKFS(crc, lazycount, attr2, projid32bit, parent) (\
+#define XFS_SB_VERSION2_MKFS(crc, lazycount, attr2, projid32bit, parent, \
+                            ftype) (\
        ((lazycount) ? XFS_SB_VERSION2_LAZYSBCOUNTBIT : 0) |            \
        ((attr2) ? XFS_SB_VERSION2_ATTR2BIT : 0) |                      \
        ((projid32bit) ? XFS_SB_VERSION2_PROJID32BIT : 0) |             \
        ((parent) ? XFS_SB_VERSION2_PARENTBIT : 0) |                    \
        ((crc) ? XFS_SB_VERSION2_CRCBIT : 0) |                          \
+       ((ftype) ? XFS_SB_VERSION2_FTYPE : 0) |                         \
        0 )
 
 #define        XFS_DFL_BLOCKSIZE_LOG   12              /* 4096 byte blocks */