Index: ci/xfsprogs/growfs/xfs_growfs.c
===================================================================
--- ci.orig/xfsprogs/growfs/xfs_growfs.c	2008-01-17 12:46:36.000000000 +1100
+++ ci/xfsprogs/growfs/xfs_growfs.c	2008-01-21 16:28:58.581225955 +1100
@@ -59,7 +59,7 @@
 	char		*logname,
 	char		*rtname,
 	int		lazycount,
-	int		dirversion,
+	char		*dirversion,
 	int		logversion,
 	int		attrversion)
 {
@@ -68,7 +68,7 @@
 	    "         =%-22s sectsz=%-5u attr=%u\n"
 	    "data     =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n"
 	    "         =%-22s sunit=%-6u swidth=%u blks\n"
-	    "naming   =version %-14u bsize=%-6u\n"
+	    "naming   =version %-14s bsize=%-6u%s\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"),
@@ -79,6 +79,7 @@
 			geo.imaxpct,
 		"", geo.sunit, geo.swidth,
   		dirversion, geo.dirblocksize,
+  		geo.flags & XFS_FSOP_GEOM_FLAGS_UNICODE ? " utf8" : "",
 		isint ? _("internal") : logname ? logname : _("external"),
 			geo.blocksize, geo.logblocks, logversion,
 		"", geo.logsectsize, geo.logsunit / geo.blocksize, lazycount,
@@ -95,7 +96,7 @@
 	long long		ddsize;	/* device size in 512-byte blocks */
 	int			dflag;	/* -d flag */
 	int			attrversion;/* attribute version number */
-	int			dirversion; /* directory version number */
+	char			*dirversion; /* directory version */
 	int			logversion; /* log version number */
 	long long		dlsize;	/* device size in 512-byte blocks */
 	long long		drsize;	/* device size in 512-byte blocks */
@@ -235,7 +236,8 @@
 	}
 	isint = geo.logstart > 0;
 	lazycount = geo.flags & XFS_FSOP_GEOM_FLAGS_LAZYSB ? 1 : 0;
-	dirversion = geo.flags & XFS_FSOP_GEOM_FLAGS_DIRV2 ? 2 : 1;
+	dirversion = geo.flags & XFS_FSOP_GEOM_FLAGS_DIRV2CI ? "ci" :
+			geo.flags & XFS_FSOP_GEOM_FLAGS_DIRV2 ? "2" : "1";
 	logversion = geo.flags & XFS_FSOP_GEOM_FLAGS_LOGV2 ? 2 : 1;
 	attrversion = geo.flags & XFS_FSOP_GEOM_FLAGS_ATTR2 ? 2 : \
 			(geo.flags & XFS_FSOP_GEOM_FLAGS_ATTR ? 1 : 0);
Index: ci/xfsprogs/include/xfs_fs.h
===================================================================
--- ci.orig/xfsprogs/include/xfs_fs.h	2007-10-10 16:12:47.000000000 +1000
+++ ci/xfsprogs/include/xfs_fs.h	2008-01-21 16:18:09.726376630 +1100
@@ -241,7 +241,9 @@
 #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_DIRV2CI	0x1000	/* ASCII only CI names */
 #define XFS_FSOP_GEOM_FLAGS_LAZYSB	0x4000	/* lazy superblock counters */
+#define XFS_FSOP_GEOM_FLAGS_UNICODE	0x10000	/* unicode filenames */
 
 
 /*