Fixed an endian based flaw in setting the old nlink count in phase 7

of xfs_repair
Merge of master-melb:xfs-cmds:27311a by kenmcd.

  Updated xfsprogs to 2.8.16

diff --git a/VERSION b/VERSION
index 23a00e0baf2ff01738dd1d2c2640421b700cc04e..3f020aa800444f27fb556f3c6f1ed47dad021615 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=8
-PKG_REVISION=15
+PKG_REVISION=16
 PKG_BUILD=1

diff --git a/doc/CHANGES b/doc/CHANGES
index 11d472f9eaf7ce94aa9b154a315b63c81d8d30ca..cf8986f8e918eb5cda5c8b31d5a1d3813f4b5687 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+xfsprogs-2.8.16 (30 October 2006)
+       - Fix up an endian problem for nlink setting in phase 7 for xfs_repair.
+       
 xfsprogs-2.8.15 (19 October 2006)
        - Fix up nlink checks and repairs in phase 7 for xfs_repair.
        - Remove a bogus LEAFN warning for a single leaf node v2 dir.

diff --git a/repair/phase7.c b/repair/phase7.c
index 4aaa12c64196d6569874474273338cc1cea37414..b656725e2b73ea4a15f2636e20b5f2c984f03981 100644 (file)
--- a/repair/phase7.c
+++ b/repair/phase7.c
@@ -180,11 +180,12 @@ phase7_alt_function(xfs_mount_t *mp, xfs_agnumber_t agno)
                                if (!XFS_SB_VERSION_HASNLINK(&mp->m_sb)) {
                                        ASSERT(dip->di_core.di_nlink <= 
                                                        XFS_MAXLINK_1);
+                                       INT_SET(dip->di_core.di_onlink, 
+                                                       ARCH_CONVERT,
+                                                       dip->di_core.di_nlink);
                                        dip->di_core.di_nlink = 
                                                INT_GET(dip->di_core.di_nlink, 
                                                        ARCH_CONVERT);
-                                       dip->di_core.di_onlink = 
-                                               dip->di_core.di_nlink;
                                } else {
                                        /* superblock support v2 nlinks */
                                        INT_SET(dip->di_core.di_version,