From: Eric Sandeen <sandeen@sgi.com>
Date: Mon, 19 Aug 2002 21:38:12 +0000 (+0000)
Subject: Bump to 2.2.2
X-Git-Tag: v2.3.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c689c5aa40054c3984f8d7189b7f686db387d553;p=thirdparty%2Fxfsprogs-dev.git

Bump to 2.2.2
---

diff --git a/VERSION b/VERSION
index 0fd0459d8..0ba7ed95b 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=2
-PKG_REVISION=1
+PKG_REVISION=2
 PKG_BUILD=0
diff --git a/doc/CHANGES b/doc/CHANGES
index 9b1b6042b..de86dd927 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,10 @@
+xfsprogs-2.2.2 (19 August 2002)
+	- Fix endian bug in xfs_db, was not flipping 16-bit numbers.
+	- Make xfs_repair recognize a NULLFSINO and print that in
+	  addition to "18446744073709551615" for easy recognition.
+	- Fix format string that xfs_repair uses when fixing inodes,
+	  so that the new inode numbers are printed correctly.
+
 xfsprogs-2.2.1 (09 August 2002)
 	- Fix buglet in libdisk get_driver_block_major() routine which
 	  would result in incorrect majors being returned for not-found
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 78baeefcc..a6b1b3313 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -343,16 +343,18 @@ calc_mkfs(xfs_mount_t *mp)
 	 */
 	if (mp->m_sb.sb_rootino != first_prealloc_ino)  {
 		do_warn(
-	"sb root inode value %llu inconsistent with calculated value %llu\n",
-		mp->m_sb.sb_rootino, first_prealloc_ino);
+	"sb root inode value %llu %sinconsistent with calculated value %lu\n",
+		mp->m_sb.sb_rootino,
+		(mp->m_sb.sb_rootino == NULLFSINO ? "(NULLFSINO) ":""),
+		first_prealloc_ino);
 
 		if (!no_modify)
 			do_warn(
-			"resetting superblock root inode pointer to %llu\n",
+			"resetting superblock root inode pointer to %lu\n",
 				first_prealloc_ino);
 		else
 			do_warn(
-			"would reset superblock root inode pointer to %llu\n",
+			"would reset superblock root inode pointer to %lu\n",
 				first_prealloc_ino);
 
 		/*
@@ -364,16 +366,18 @@ calc_mkfs(xfs_mount_t *mp)
 
 	if (mp->m_sb.sb_rbmino != first_prealloc_ino + 1)  {
 		do_warn(
-"sb realtime bitmap inode %llu inconsistent with calculated value %llu\n",
-		mp->m_sb.sb_rbmino, first_prealloc_ino + 1);
+"sb realtime bitmap inode %llu %sinconsistent with calculated value %lu\n",
+		mp->m_sb.sb_rbmino,
+		(mp->m_sb.sb_rbmino == NULLFSINO ? "(NULLFSINO) ":""),
+		first_prealloc_ino + 1);
 
 		if (!no_modify)
 			do_warn(
-		"resetting superblock realtime bitmap ino pointer to %llu\n",
+		"resetting superblock realtime bitmap ino pointer to %lu\n",
 				first_prealloc_ino + 1);
 		else
 			do_warn(
-		"would reset superblock realtime bitmap ino pointer to %llu\n",
+		"would reset superblock realtime bitmap ino pointer to %lu\n",
 				first_prealloc_ino + 1);
 
 		/*
@@ -385,16 +389,18 @@ calc_mkfs(xfs_mount_t *mp)
 
 	if (mp->m_sb.sb_rsumino != first_prealloc_ino + 2)  {
 		do_warn(
-"sb realtime summary inode %llu inconsistent with calculated value %llu\n",
-		mp->m_sb.sb_rsumino, first_prealloc_ino + 2);
+"sb realtime summary inode %llu %sinconsistent with calculated value %lu\n",
+		mp->m_sb.sb_rsumino,
+		(mp->m_sb.sb_rsumino == NULLFSINO ? "(NULLFSINO) ":""),
+		first_prealloc_ino + 2);
 
 		if (!no_modify)
 			do_warn(
-		"resetting superblock realtime summary ino pointer to %llu\n",
+		"resetting superblock realtime summary ino pointer to %lu\n",
 				first_prealloc_ino + 2);
 		else
 			do_warn(
-		"would reset superblock realtime summary ino pointer to %llu\n",
+		"would reset superblock realtime summary ino pointer to %lu\n",
 				first_prealloc_ino + 2);
 
 		/*