svn commit: r201401 - head/sbin/growfs

Gavin Atkinson gavin at FreeBSD.org
Sat Jan 2 20:18:10 UTC 2010


Author: gavin
Date: Sat Jan  2 20:18:10 2010
New Revision: 201401
URL: http://svn.freebsd.org/changeset/base/201401

Log:
  Remove dead code.  This section of code is only run in the
  (sblock.fs_magic == FS_UFS1_MAGIC) case, so the check within the
  loop is redundant.
  
  Submitted by:	Nate Eldredge  nge cs.hmc.edu
  Reviewed by:	mjacob
  Approved by:	ed (mentor)
  MFC after:	1 month

Modified:
  head/sbin/growfs/growfs.c

Modified: head/sbin/growfs/growfs.c
==============================================================================
--- head/sbin/growfs/growfs.c	Sat Jan  2 17:45:53 2010	(r201400)
+++ head/sbin/growfs/growfs.c	Sat Jan  2 20:18:10 2010	(r201401)
@@ -376,7 +376,6 @@ initcg(int cylno, time_t utime, int fso,
 	long d, dlower, dupper, blkno, start;
 	ufs2_daddr_t i, cbase, dmax;
 	struct ufs1_dinode *dp1;
-	struct ufs2_dinode *dp2;
 	struct csum *cs;
 
 	if (iobuf == NULL && (iobuf = malloc(sblock.fs_bsize)) == NULL) {
@@ -460,16 +459,11 @@ initcg(int cylno, time_t utime, int fso,
 		for (i = 2 * sblock.fs_frag; i < sblock.fs_ipg / INOPF(&sblock);
 		     i += sblock.fs_frag) {
 			dp1 = (struct ufs1_dinode *)iobuf;
-			dp2 = (struct ufs2_dinode *)iobuf;
 #ifdef FSIRAND
-			for (j = 0; j < INOPB(&sblock); j++)
-				if (sblock.fs_magic == FS_UFS1_MAGIC) {
-					dp1->di_gen = random();
-					dp1++;
-				} else {
-					dp2->di_gen = random();
-					dp2++;
-				}
+			for (j = 0; j < INOPB(&sblock); j++) {
+				dp1->di_gen = random();
+				dp1++;
+			}
 #endif
 			wtfs(fsbtodb(&sblock, cgimin(&sblock, cylno) + i),
 			    sblock.fs_bsize, iobuf, fso, Nflag);


More information about the svn-src-head mailing list