Fix an endian bug in xfs_db freesp command.

Fix an endian bug in xfs_db freesp command.

diff --git a/VERSION b/VERSION
index 419cfb1d6c265ebd62cbea65b453e64f41334135..e684dab0d7a29f1aee555b1fd0bfe9264ca358e8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=3
-PKG_REVISION=6
+PKG_REVISION=7
 PKG_BUILD=0

diff --git a/db/freesp.c b/db/freesp.c
index 4af233154c54618617fec336fbec9ac32fda2a9f..edb84401b94bc4992ab29f38a2411ac632e2101d 100644 (file)
--- a/db/freesp.c
+++ b/db/freesp.c
@@ -312,13 +312,15 @@ scanfunc_bno(
                        1, mp->m_alloc_mxr[0]);
                for (i = 0; i < INT_GET(block->bb_numrecs, ARCH_CONVERT); i++)
                        addtohist(INT_GET(agf->agf_seqno, ARCH_CONVERT),
-                               INT_GET(rp[i].ar_startblock, ARCH_CONVERT), INT_GET(rp[i].ar_blockcount, ARCH_CONVERT));
+                               INT_GET(rp[i].ar_startblock, ARCH_CONVERT),
+                               INT_GET(rp[i].ar_blockcount, ARCH_CONVERT));
                return;
        }
        pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize, xfs_alloc, block, 1,
                mp->m_alloc_mxr[1]);
        for (i = 0; i < INT_GET(block->bb_numrecs, ARCH_CONVERT); i++)
-               scan_sbtree(agf, pp[i], typ, level, scanfunc_bno);
+               scan_sbtree(agf, INT_GET(pp[i], ARCH_CONVERT), typ, level,
+                           scanfunc_bno);
 }
 
 static void
@@ -338,13 +340,15 @@ scanfunc_cnt(
                        1, mp->m_alloc_mxr[0]);
                for (i = 0; i < INT_GET(block->bb_numrecs, ARCH_CONVERT); i++)
                        addtohist(INT_GET(agf->agf_seqno, ARCH_CONVERT),
-                               INT_GET(rp[i].ar_startblock, ARCH_CONVERT), INT_GET(rp[i].ar_blockcount, ARCH_CONVERT));
+                               INT_GET(rp[i].ar_startblock, ARCH_CONVERT),
+                               INT_GET(rp[i].ar_blockcount, ARCH_CONVERT));
                return;
        }
        pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize, xfs_alloc, block, 1,
                mp->m_alloc_mxr[1]);
        for (i = 0; i < INT_GET(block->bb_numrecs, ARCH_CONVERT); i++)
-               scan_sbtree(agf, pp[i], typ, level, scanfunc_cnt);
+               scan_sbtree(agf, INT_GET(pp[i], ARCH_CONVERT), typ, level,
+                           scanfunc_cnt);
 }
 
 static void

diff --git a/debian/changelog b/debian/changelog
index 96e4c7f769ab6096b6170a59a149a376d5c7d640..e7a326dd73bac0978f58e55f6a93f5a0782ef8a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.3.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 14 Nov 2002 17:42:22 +1100
+
 xfsprogs (2.3.6-1) unstable; urgency=low
 
   * New upstream release

diff --git a/doc/CHANGES b/doc/CHANGES
index 6b5360038e31ffbfd788f5ee11dfdf1559349440..1fc7f173cbaa108c6eaea2191dfc916d2d23ead5 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.3.7 (14 November 2002)
+       - Fix an endian bug in xfs_db freesp command when descending
+         into multi-level agf cnt/bno btrees.
+
 xfsprogs-2.3.6 (31 October 2002)
        - Sync up user/kernel source in lib{xfs,xlog} and headers.
        - Fix several warnings from newer (3.2) versions of gcc.