From: Barry Naujok <bnaujok@sgi.com>
Date: Thu, 5 Jun 2008 04:28:00 +0000 (+0000)
Subject: Fix up incorrect mkfs/growfs output for ascii-ci mode
X-Git-Tag: v3.0.0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1654e351f3a148ddf431f68a8f6b06c6d27f6974;p=thirdparty%2Fxfsprogs-dev.git

Fix up incorrect mkfs/growfs output for ascii-ci mode
Merge of master-melb:xfs-cmds:31275a by kenmcd.

  Fix up incorrect growfs output for ascii-ci mode
---

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 8e53ff5fc..4a86b9dac 100644
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -69,7 +69,7 @@ report_info(
 	    "         =%-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 mixed-case=%c\n"
+	    "naming   =version %-14u bsize=%-6u ascii-ci=%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"),
@@ -79,7 +79,7 @@ report_info(
 		"", geo.blocksize, (unsigned long long)geo.datablocks,
 			geo.imaxpct,
 		"", geo.sunit, geo.swidth,
-  		dirversion, geo.dirblocksize, cimode ? 'N' : 'Y',
+  		dirversion, geo.dirblocksize, cimode,
 		isint ? _("internal") : logname ? logname : _("external"),
 			geo.blocksize, geo.logblocks, logversion,
 		"", geo.logsectsize, geo.logsunit / geo.blocksize, lazycount,
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index ff0d9d010..53e5c75ad 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2017,7 +2017,7 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
 		   "         =%-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 mixed-case=%c\n"
+		   "naming   =version %-14u bsize=%-6u ascii-ci=%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"),
@@ -2026,7 +2026,7 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
 			"", blocksize, (long long)dblocks,
 			       calc_default_imaxpct(blocklog, dblocks),
 			"", dsunit, dswidth,
-			dirversion, dirblocksize, nci ? 'N' : 'Y',
+			dirversion, dirblocksize, nci,
 			logfile, 1 << blocklog, (long long)logblocks,
 			logversion, "", lsectorsize, lsunit, lazy_sb_counters,
 			rtfile, rtextblocks << blocklog,
@@ -2576,7 +2576,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=n]\n\
+/* naming */		[-n log=n|size=num,version=2|ci]\n\
 /* prototype file */	[-p fname]\n\
 /* quiet */		[-q]\n\
 /* realtime subvol */	[-r extsize=num,size=num,rtdev=xxx]\n\