From: Barry Naujok <bnaujok@sgi.com>
Date: Tue, 16 May 2006 06:05:01 +0000 (+0000)
Subject: pv:952931
X-Git-Tag: v2.8.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13002e2341b2c2122158273b895b4d02448ba7c4;p=thirdparty%2Fxfsprogs-dev.git

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 f91140a08..f3b44c7cd 100644
--- 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 e89eec0da..9594e6f23 100644
--- 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 492bd86a7..ac37adc8b 100644
--- 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);