xfs
[Top] [All Lists]

[PATCH 10/13] xfsprogs: add utf8 support to growfs

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 10/13] xfsprogs: add utf8 support to growfs
From: Ben Myers <bpm@xxxxxxx>
Date: Thu, 18 Sep 2014 15:40:16 -0500
Cc: xfs@xxxxxxxxxxx, olaf@xxxxxxx, tinguely@xxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20140918203114.GN4482@xxxxxxx>
References: <20140918195650.GI19952@xxxxxxx> <20140918203114.GN4482@xxxxxxx>
User-agent: Mutt/1.5.20 (2009-06-14)
From: Mark Tinguely <tinguely@xxxxxxx>

Add reporting of the utf-8 mkfs options to xfs_growfs and xfs_info.

Signed-off-by: Mark Tinguely <tinguely@xxxxxxx>
---
 growfs/xfs_growfs.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 8e611b6..6c41803 100644
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -57,7 +57,8 @@ report_info(
        int             crcs_enabled,
        int             cimode,
        int             ftype_enabled,
-       int             finobt_enabled)
+       int             finobt_enabled,
+       int             utf8)
 {
        printf(_(
            "meta-data=%-22s isize=%-6u agcount=%u, agsize=%u blks\n"
@@ -65,7 +66,7 @@ report_info(
            "         =%-22s crc=%-8u finobt=%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 ftype=%d\n"
+           "naming   =version %-14u bsize=%-6u ascii-ci=%d ftype=%d utf8=%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"),
@@ -76,7 +77,7 @@ report_info(
                "", geo.blocksize, (unsigned long long)geo.datablocks,
                        geo.imaxpct,
                "", geo.sunit, geo.swidth,
-               dirversion, geo.dirblocksize, cimode, ftype_enabled,
+               dirversion, geo.dirblocksize, cimode, ftype_enabled, utf8,
                isint ? _("internal") : logname ? logname : _("external"),
                        geo.blocksize, geo.logblocks, logversion,
                "", geo.logsectsize, geo.logsunit / geo.blocksize, lazycount,
@@ -114,6 +115,7 @@ main(int argc, char **argv)
        long long               rsize;  /* new rt size in fs blocks */
        int                     ci;     /* ASCII case-insensitive fs */
        int                     lazycount; /* lazy superblock counters */
+       int                     utf8;   /* Unicode chars supported */
        int                     xflag;  /* -x flag */
        char                    *fname; /* mount point name */
        char                    *datadev; /* data device name */
@@ -247,11 +249,12 @@ main(int argc, char **argv)
        crcs_enabled = geo.flags & XFS_FSOP_GEOM_FLAGS_V5SB ? 1 : 0;
        ftype_enabled = geo.flags & XFS_FSOP_GEOM_FLAGS_FTYPE ? 1 : 0;
        finobt_enabled = geo.flags & XFS_FSOP_GEOM_FLAGS_FINOBT ? 1 : 0;
+       utf8 = geo.flags & XFS_FSOP_GEOM_FLAGS_UTF8 ? 1 : 0;
        if (nflag) {
                report_info(geo, datadev, isint, logdev, rtdev,
                                lazycount, dirversion, logversion,
                                attrversion, projid32bit, crcs_enabled, ci,
-                               ftype_enabled, finobt_enabled);
+                               ftype_enabled, finobt_enabled, utf8);
                exit(0);
        }
 
@@ -289,7 +292,7 @@ main(int argc, char **argv)
        report_info(geo, datadev, isint, logdev, rtdev,
                        lazycount, dirversion, logversion,
                        attrversion, projid32bit, crcs_enabled, ci, 
ftype_enabled,
-                       finobt_enabled);
+                       finobt_enabled, utf8);
 
        ddsize = xi.dsize;
        dlsize = ( xi.logBBsize? xi.logBBsize :
-- 
1.7.12.4

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