summaryrefslogtreecommitdiff
path: root/usr.sbin/makefs/ffs.c
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2016-11-06 12:33:31 +0000
committerMartin Natano <natano@cvs.openbsd.org>2016-11-06 12:33:31 +0000
commitec6542fb7881ba68a65ceed9919c89afe7d5529a (patch)
treee056e6fcd4351e1dd9d7127c75a39972e21d79f2 /usr.sbin/makefs/ffs.c
parent8b1461b6280c1bfeb98d72d837cef93186df3143 (diff)
Remove unused fields from ffs_opt_t.
Diffstat (limited to 'usr.sbin/makefs/ffs.c')
-rw-r--r--usr.sbin/makefs/ffs.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 338ac402652..a6a92cea096 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs.c,v 1.19 2016/10/26 15:31:13 natano Exp $ */
+/* $OpenBSD: ffs.c,v 1.20 2016/11/06 12:33:30 natano Exp $ */
/* $NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $ */
/*
@@ -101,12 +101,6 @@
#define DFL_BLKSIZE 8192 /* block size */
#define DFL_SECSIZE 512 /* sector size */
#define DFL_CYLSPERGROUP 65536 /* cylinders per group */
-#define DFL_FRAGSPERINODE 4 /* fragments per inode */
-#define DFL_ROTDELAY 0 /* rotational delay */
-#define DFL_NRPOS 1 /* rotational positions */
-#define DFL_RPM 3600 /* rpm of disk */
-#define DFL_NSECTORS 64 /* # of sectors */
-#define DFL_NTRACKS 16 /* # of tracks */
typedef struct {
@@ -277,11 +271,7 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts)
ffs_opts->bsize = MIN(DFL_BLKSIZE, 8 * ffs_opts->fsize);
if (ffs_opts->cpg == -1)
ffs_opts->cpg = DFL_CYLSPERGROUP;
- else
- ffs_opts->cpgflg = 1;
/* fsopts->density is set below */
- if (ffs_opts->nsectors == -1)
- ffs_opts->nsectors = DFL_NSECTORS;
if (ffs_opts->minfree == -1)
ffs_opts->minfree = MINFREE;
if (ffs_opts->optimization == -1)