Bump to 2.2.2

diff --git a/VERSION b/VERSION
index 0fd0459d8ab5a0b7b8dc69e29b5330f82fe9ef8b..0ba7ed95b24c871cbc63e44e220b56a673141b77 100644 (file)
--- 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 9b1b6042b12006c73a3a2cd89d3009a5ee35978e..de86dd9278d9071d7bdeb8631ad2c614b07eda6e 100644 (file)
--- 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 78baeefccf42a9ab05fc30722255f449dac822dd..a6b1b3313a161e2027fd919e113446f81d7968e3 100644 (file)
--- 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);
 
                /*