diff options
| -rw-r--r-- | sbin/dumpfs/dumpfs.c | 7 | ||||
| -rw-r--r-- | sbin/newfs/mkfs.c | 11 | ||||
| -rw-r--r-- | sbin/newfs/newfs.c | 8 |
3 files changed, 9 insertions, 17 deletions
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index c330c8b022d..2ffb2d1a9be 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumpfs.c,v 1.4 1996/06/23 14:30:16 deraadt Exp $ */ +/* $OpenBSD: dumpfs.c,v 1.5 1997/02/11 07:01:27 millert Exp $ */ /* $NetBSD: dumpfs.c,v 1.11 1996/01/09 21:23:36 pk Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dumpfs.c 8.2 (Berkeley) 2/2/94"; #else -static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.4 1996/06/23 14:30:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.5 1997/02/11 07:01:27 millert Exp $"; #endif #endif /* not lint */ @@ -154,8 +154,7 @@ dumpfs(name) printf("minfree\t%d%%\toptim\t%s\tmaxcontig %d\tmaxbpg\t%d\n", afs.fs_minfree, afs.fs_optim == FS_OPTSPACE ? "space" : "time", afs.fs_maxcontig, afs.fs_maxbpg); - printf("rotdelay %dms\theadswitch %dus\ttrackseek %dus\trps\t%d\n", - afs.fs_rotdelay, afs.fs_headswitch, afs.fs_trkseek, afs.fs_rps); + printf("rotdelay %dms\trps\t%d\n", afs.fs_rotdelay, afs.fs_rps); printf("ntrak\t%d\tnsect\t%d\tnpsect\t%d\tspc\t%d\n", afs.fs_ntrak, afs.fs_nsect, afs.fs_npsect, afs.fs_spc); printf("symlinklen %d\ttrackskew %d\tinterleave %d\tcontigsumsize %d\n", diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 09ef2fd3567..648ea9760e2 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkfs.c,v 1.3 1996/08/02 11:00:50 deraadt Exp $ */ +/* $OpenBSD: mkfs.c,v 1.4 1997/02/11 07:01:37 millert Exp $ */ /* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)mkfs.c 8.3 (Berkeley) 2/3/94"; #else -static char rcsid[] = "$OpenBSD: mkfs.c,v 1.3 1996/08/02 11:00:50 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mkfs.c,v 1.4 1997/02/11 07:01:37 millert Exp $"; #endif #endif /* not lint */ @@ -92,8 +92,6 @@ extern int sectorsize; /* bytes/sector */ extern int rpm; /* revolutions/minute of drive */ extern int interleave; /* hardware sector interleave */ extern int trackskew; /* sector 0 skew, per track */ -extern int headswitch; /* head switch time, usec */ -extern int trackseek; /* track-to-track seek, usec */ extern int fsize; /* fragment size */ extern int bsize; /* block size */ extern int cpg; /* cylinders/cylinder group */ @@ -563,8 +561,6 @@ next: sblock.fs_rotdelay = rotdelay; sblock.fs_minfree = minfree; sblock.fs_maxcontig = maxcontig; - sblock.fs_headswitch = headswitch; - sblock.fs_trkseek = trackseek; sblock.fs_maxbpg = maxbpg; sblock.fs_rps = rpm / 60; sblock.fs_optim = opt; @@ -723,9 +719,10 @@ initcg(cylno, utime) setbit(cg_inosused(&acg), i); acg.cg_cs.cs_nifree--; } - for (i = 0; i < sblock.fs_ipg / INOPF(&sblock); i += sblock.fs_frag) + for (i = 0; i < sblock.fs_ipg / INOPF(&sblock); i += sblock.fs_frag) { wtfs(fsbtodb(&sblock, cgimin(&sblock, cylno) + i), sblock.fs_bsize, (char *)zino); + } if (cylno > 0) { /* * In cylno 0, beginning space is reserved diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 415064a9618..f8dda6c37a3 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.11 1997/01/16 05:48:02 millert Exp $ */ +/* $OpenBSD: newfs.c,v 1.12 1997/02/11 07:01:38 millert Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.11 1997/01/16 05:48:02 millert Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.12 1997/02/11 07:01:38 millert Exp $"; #endif #endif /* not lint */ @@ -163,8 +163,6 @@ int realsectorsize; /* bytes/sector in hardware */ int rpm; /* revolutions/minute of drive */ int interleave; /* hardware sector interleave */ int trackskew = -1; /* sector 0 skew, per track */ -int headswitch; /* head switch time, usec */ -int trackseek; /* track-to-track seek, usec */ int fsize = 0; /* fragment size */ int bsize = 0; /* block size */ int cpg = DESCPG; /* cylinders/cylinder group */ @@ -547,8 +545,6 @@ havelabel: "disagrees with disk label", lp->d_secpercyl); if (maxbpg == 0) maxbpg = MAXBLKPG(bsize); - headswitch = lp->d_headswitch; - trackseek = lp->d_trkseek; #ifdef notdef /* label may be 0 if faked up by kernel */ bbsize = lp->d_bbsize; sbsize = lp->d_sbsize; |