d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r201401 from head:

Browse Source 
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)
This commit is contained in:
gavin 2010-02-02 19:51:30 +00:00
parent 9ce8997aab
commit eb2e9eedcb
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/growfs/growfs.c
View File

@ -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);