svn commit: r203835 - head/sbin/growfs

[Gavin Atkinson]

Author: gavin
Date: Sat Feb 13 16:22:08 2010
New Revision: 203835
URL: http://svn.freebsd.org/changeset/base/203835

Log:
  When growing a UFS1 filesystem, we need to initialise all inodes in any new
  cylinder groups that are created.  When the filesystem is first created,
  newfs always initialises the first two blocks of inodes, and then in the
  UFS1 case will also initialise the remaining inode blocks.  The changes in
  growfs.c 1.23 broke the initialisation of all inodes, seemingly based on
  this implementation detail in newfs(8).  The result was that instead of
  initialising all inodes, we would actually end up initialising all but the
  first two blocks of inodes.  If the filesystem was grown into empty
  (all-zeros) space then the resulting filesystem was fine, however when
  grown onto non-zeroed space the filesystem produced would appear to have
  massive corruption on the first fsck after growing.
  A test case for this problem can be found in the PR audit trail.
  
  Fix this by once again initialising all inodes in the UFS1 case.
  
  PR:		bin/115174
  Submitted by:	Nate Eldredgei  nge cs.hmc.edu
  Reviewed by:	mjacob
  MFC after:	1 month

Modified:
  head/sbin/growfs/growfs.c

Modified: head/sbin/growfs/growfs.c
==============================================================================
--- head/sbin/growfs/growfs.c	Sat Feb 13 16:04:58 2010	(r203834)
+++ head/sbin/growfs/growfs.c	Sat Feb 13 16:22:08 2010	(r203835)
@@ -450,13 +450,11 @@ initcg(int cylno, time_t utime, int fso,
 			acg.cg_cs.cs_nifree--;
 		}
 	/*
-	 * XXX Newfs writes out two blocks of initialized inodes
-	 *     unconditionally.  Should we check here to make sure that they
-	 *     were actually written?
+	 * For the old file system, we have to initialize all the inodes.
 	 */
 	if (sblock.fs_magic == FS_UFS1_MAGIC) {
 		bzero(iobuf, sblock.fs_bsize);
-		for (i = 2 * sblock.fs_frag; i < sblock.fs_ipg / INOPF(&sblock);
+		for (i = 0; i < sblock.fs_ipg / INOPF(&sblock);
 		     i += sblock.fs_frag) {
 			dp1 = (struct ufs1_dinode *)iobuf;
 #ifdef FSIRAND