pv:952931

Phase 4 didn't clear the entire bmap array
Merge of master-melb:xfs-cmds:25947a by kenmcd.

  Updated version number

diff --git a/VERSION b/VERSION
index f91140a08cb4c97a9229df574ee35eae20f57150..f3b44c7cd1c6f58240b868c9c8afcc8bec210c6c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=7
-PKG_REVISION=16
+PKG_REVISION=18
 PKG_BUILD=1

diff --git a/doc/CHANGES b/doc/CHANGES
index e89eec0dac31e206c625a0f6efe2af0cd9209c54..9594e6f236476d673ac0e455da1f71e4d4bcb6d0 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,5 +1,7 @@
-[cvs]
-       - Fix a case where xfs_repair could incorrectly flag extent
+xfsprogs-2.7.18 (16 May 2006)
+       - Fixed a case where xfs_repair was reporting a valid used 
+         block as a duplicate during phase 4.
+       - Fixed a case where xfs_repair could incorrectly flag extent
          b+tree nodes as corrupt.
        - Portability changes, get xfs_repair compiling on IRIX.
        - Parent pointer updates in xfs_io checker command.

diff --git a/repair/phase4.c b/repair/phase4.c
index 492bd86a7b9bc8b55c3382ca4c9ffc28e7fc8b59..ac37adc8b7d4169b58db7c5ea652f21138cd4131 100644 (file)
--- a/repair/phase4.c
+++ b/repair/phase4.c
@@ -1301,13 +1301,11 @@ phase4(xfs_mount_t *mp)
         * initialize bitmaps for all AGs
         */
        for (i = 0; i < mp->m_sb.sb_agcount; i++)  {
-               ag_end = (i < mp->m_sb.sb_agcount - 1) ? mp->m_sb.sb_agblocks :
-                       mp->m_sb.sb_dblocks -
-                               (xfs_drfsbno_t) mp->m_sb.sb_agblocks * i;
                /*
                 * now reset the bitmap for all ags
                 */
-               bzero(ba_bmap[i], roundup(mp->m_sb.sb_agblocks/(NBBY/XR_BB),
+               bzero(ba_bmap[i], 
+                   roundup((mp->m_sb.sb_agblocks+(NBBY/XR_BB)-1)/(NBBY/XR_BB),
                                                sizeof(__uint64_t)));
                for (j = 0; j < ag_hdr_block; j++)
                        set_agbno_state(mp, i, j, XR_E_INUSE_FS);