[PATCH 2/3] xfsprog: add dirent filetype information for xfs_info

[Mark Tinguely <tinguely@xxxxxxx>]

Make xfs_info aware of the directory inode type.

Signed-off-by: Mark Tinguely <tinguely@xxxxxxx>
---
 growfs/xfs_growfs.c |   14 +++++++++-----
 include/xfs_fs.h    |   31 ++++++++++++++++---------------
 2 files changed, 25 insertions(+), 20 deletions(-)

Index: b/growfs/xfs_growfs.c
===================================================================
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -55,7 +55,8 @@ report_info(
        int             attrversion,
        int             projid32bit,
        int             crcs_enabled,
-       int             cimode)
+       int             cimode,
+       int             ftype_enabled)
 {
        printf(_(
            "meta-data=%-22s isize=%-6u agcount=%u, agsize=%u blks\n"
@@ -63,7 +64,7 @@ report_info(
            "         =%-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 field=%d\n"
            "log      =%-22s bsize=%-6u blocks=%u, version=%u\n"
            "         =%-22s sectsz=%-5u sunit=%u blks, lazy-count=%u\n"
            "realtime =%-22s extsz=%-6u blocks=%llu, rtextents=%llu\n"),
@@ -74,7 +75,7 @@ report_info(
                "", geo.blocksize, (unsigned long long)geo.datablocks,
                        geo.imaxpct,
                "", geo.sunit, geo.swidth,
-               dirversion, geo.dirblocksize, cimode,
+               dirversion, geo.dirblocksize, cimode, ftype_enabled,
                isint ? _("internal") : logname ? logname : _("external"),
                        geo.blocksize, geo.logblocks, logversion,
                "", geo.logsectsize, geo.logsunit / geo.blocksize, lazycount,
@@ -121,6 +122,7 @@ main(int argc, char **argv)
        libxfs_init_t           xi;     /* libxfs structure */
        int                     projid32bit;
        int                     crcs_enabled;
+       int                     ftype_enabled = 0;
 
        progname = basename(argv[0]);
        setlocale(LC_ALL, "");
@@ -242,10 +244,12 @@ main(int argc, char **argv)
        ci = geo.flags & XFS_FSOP_GEOM_FLAGS_DIRV2CI ? 1 : 0;
        projid32bit = geo.flags & XFS_FSOP_GEOM_FLAGS_PROJID32 ? 1 : 0;
        crcs_enabled = geo.flags & XFS_FSOP_GEOM_FLAGS_V5SB ? 1 : 0;
+       ftype_enabled = geo.flags & XFS_FSOP_GEOM_FLAGS_FTYPE ? 1 : 0;
        if (nflag) {
                report_info(geo, datadev, isint, logdev, rtdev,
                                lazycount, dirversion, logversion,
-                               attrversion, projid32bit, crcs_enabled, ci);
+                               attrversion, projid32bit, crcs_enabled, ci,
+                               ftype_enabled);
                exit(0);
        }
 
@@ -282,7 +286,7 @@ main(int argc, char **argv)
 
        report_info(geo, datadev, isint, logdev, rtdev,
                        lazycount, dirversion, logversion,
-                       attrversion, projid32bit, crcs_enabled, ci);
+                       attrversion, projid32bit, crcs_enabled, ci, 
ftype_enabled);
 
        ddsize = xi.dsize;
        dlsize = ( xi.logBBsize? xi.logBBsize :
Index: b/include/xfs_fs.h
===================================================================
--- a/include/xfs_fs.h
+++ b/include/xfs_fs.h
@@ -222,21 +222,22 @@ typedef struct xfs_fsop_resblks {
 
 #define XFS_FSOP_GEOM_VERSION  0
 
-#define XFS_FSOP_GEOM_FLAGS_ATTR       0x0001  /* attributes in use    */
-#define XFS_FSOP_GEOM_FLAGS_NLINK      0x0002  /* 32-bit nlink values  */
-#define XFS_FSOP_GEOM_FLAGS_QUOTA      0x0004  /* quotas enabled       */
-#define XFS_FSOP_GEOM_FLAGS_IALIGN     0x0008  /* inode alignment      */
-#define XFS_FSOP_GEOM_FLAGS_DALIGN     0x0010  /* large data alignment */
-#define XFS_FSOP_GEOM_FLAGS_SHARED     0x0020  /* read-only shared     */
-#define XFS_FSOP_GEOM_FLAGS_EXTFLG     0x0040  /* special extent flag  */
-#define XFS_FSOP_GEOM_FLAGS_DIRV2      0x0080  /* directory version 2  */
-#define XFS_FSOP_GEOM_FLAGS_LOGV2      0x0100  /* log format version 2 */
-#define XFS_FSOP_GEOM_FLAGS_SECTOR     0x0200  /* sector sizes >1BB    */
-#define XFS_FSOP_GEOM_FLAGS_ATTR2      0x0400  /* inline attributes rework */
-#define XFS_FSOP_GEOM_FLAGS_PROJID32   0x0800  /* 32-bit project IDs   */
-#define XFS_FSOP_GEOM_FLAGS_DIRV2CI    0x1000  /* ASCII only CI names  */
-#define XFS_FSOP_GEOM_FLAGS_LAZYSB     0x4000  /* lazy superblock counters */
-#define XFS_FSOP_GEOM_FLAGS_V5SB       0x8000  /* version 5 superblock */
+#define XFS_FSOP_GEOM_FLAGS_ATTR       0x00001 /* attributes in use    */
+#define XFS_FSOP_GEOM_FLAGS_NLINK      0x00002 /* 32-bit nlink values  */
+#define XFS_FSOP_GEOM_FLAGS_QUOTA      0x00004 /* quotas enabled       */
+#define XFS_FSOP_GEOM_FLAGS_IALIGN     0x00008 /* inode alignment      */
+#define XFS_FSOP_GEOM_FLAGS_DALIGN     0x00010 /* large data alignment */
+#define XFS_FSOP_GEOM_FLAGS_SHARED     0x00020 /* read-only shared     */
+#define XFS_FSOP_GEOM_FLAGS_EXTFLG     0x00040 /* special extent flag  */
+#define XFS_FSOP_GEOM_FLAGS_DIRV2      0x00080 /* directory version 2  */
+#define XFS_FSOP_GEOM_FLAGS_LOGV2      0x00100 /* log format version 2 */
+#define XFS_FSOP_GEOM_FLAGS_SECTOR     0x00200 /* sector sizes >1BB    */
+#define XFS_FSOP_GEOM_FLAGS_ATTR2      0x00400 /* inline attributes rework */
+#define XFS_FSOP_GEOM_FLAGS_PROJID32   0x00800 /* 32-bit project IDs   */
+#define XFS_FSOP_GEOM_FLAGS_DIRV2CI    0x01000 /* ASCII only CI names  */
+#define XFS_FSOP_GEOM_FLAGS_LAZYSB     0x04000 /* lazy superblock counters */
+#define XFS_FSOP_GEOM_FLAGS_V5SB       0x08000 /* version 5 superblock */
+#define XFS_FSOP_GEOM_FLAGS_FTYPE      0x10000 /* inode directory types */
 
 
 /*