rpms/xfsprogs/devel xfsprogs-2.9.4-misc-mkfs-fixes.patch, NONE, 1.1 xfsprogs.spec, 1.31, 1.32

[Eric Sandeen (sandeen)]

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27838

Modified Files:
	xfsprogs.spec 
Added Files:
	xfsprogs-2.9.4-misc-mkfs-fixes.patch 
Log Message:
* Tue Oct 02 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-3
- mkfs.xfs: Fix wiping old AG headers and purge whack buffers


xfsprogs-2.9.4-misc-mkfs-fixes.patch:

--- NEW FILE xfsprogs-2.9.4-misc-mkfs-fixes.patch ---
To: sgi.bugs.xfs at engr.sgi.com
Cc: xfs at oss.sgi.com
Subject: TAKE 970978 - Fix a couple mkfs.xfs issues
Date: Tue, 25 Sep 2007 13:52:54 +1000 (EST)
From: bnaujok at sgi.com (Barry Naujok)

Fix wiping old AG headers and purge whack buffers


Date:  Tue Sep 25 13:52:20 AEST 2007
Workarea:  chook.melbourne.sgi.com:/home/bnaujok/isms/xfs-cmds
Inspected by:  sandeen at sandeen.net

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-cmds/master-melb


Modid:  master-melb:xfs-cmds:29767a
xfsprogs/mkfs/xfs_mkfs.c - 1.82 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-cmds/xfsprogs/mkfs/xfs_mkfs.c.diff?r1=text&tr1=1.82&r2=text&tr2=1.81&f=h
	- Fix wiping old AG headers and purge whack buffers

--- xfsprogs/mkfs/xfs_mkfs.c	2007/07/16 03:56:15	1.81
+++ xfsprogs/mkfs/xfs_mkfs.c	2007/09/25 06:15:37	1.82
@@ -558,15 +558,12 @@ zero_old_xfs_structures(
 		goto done;
 
 	/*
-	 * block size and basic geometry seems alright, zero the secondaries,
-	 * but don't go beyond the end of the new filesystem.
+	 * block size and basic geometry seems alright, zero the secondaries.
 	 */
 	bzero(buf, new_sb->sb_sectsize);
 	off = 0;
 	for (i = 1; i < sb.sb_agcount; i++)  {
 		off += sb.sb_agblocks;
-		if (off >= new_sb->sb_dblocks)
-			break;
 		if (pwrite64(xi->dfd, buf, new_sb->sb_sectsize,
 					off << sb.sb_blocklog) == -1)
 			break;
@@ -2115,6 +2112,7 @@ an AG size that is one stripe unit small
 				    BTOBB(WHACK_SIZE));
 		bzero(XFS_BUF_PTR(buf), WHACK_SIZE);
 		libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
+		libxfs_purgebuf(buf);
 	}
 
 	/*



Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xfsprogs.spec	1 Oct 2007 23:09:10 -0000	1.31
+++ xfsprogs.spec	2 Oct 2007 14:40:47 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem
 Name: xfsprogs
 Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -19,6 +19,8 @@
 Obsoletes: xfs-cmds <= %{version}
 Conflicts: xfsdump < 2.0.0
 
+Patch1: xfsprogs-2.9.4-misc-mkfs-fixes.patch
+
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
 
@@ -48,6 +50,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # xfsprogs does not ship ./configure
@@ -111,6 +114,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct 02 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-3
+- mkfs.xfs: Fix wiping old AG headers and purge whack buffers
+
 * Mon Oct 01 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-2
 - Add alpha to the multilib wrapper (#310411)