From f394f84d2d0c4c198f6df88c5d064448d16b325c Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 2 Feb 2010 19:51:30 +0000 Subject: [PATCH] Merge r201401 from head: 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. PR: bin/115174 (partly) Submitted by: Nate Eldredge nge cs.hmc.edu Reviewed by: mjacob Approved by: ed (mentor, implicit) git-svn-id: svn://svn.freebsd.org/base/stable/8@203397 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sbin/growfs/growfs.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index 89b14dac2..cc58fc626 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -376,7 +376,6 @@ initcg(int cylno, time_t utime, int fso, unsigned int Nflag) 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) { @@ -455,16 +454,11 @@ initcg(int cylno, time_t utime, int fso, unsigned int Nflag) 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); -- 2.45.0