diff options
| author |   natano <natano@openbsd.org> | 2016-11-06 12:33:30 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-11-06 12:33:30 +0000 |
| commit | a40bc605082ab4d4b0c58c934b7919719745bc84 (patch) | |
| tree | 2c0f0f50214c7fb3cb13cca880095237b6a30c77 /usr.sbin/makefs | |
| parent | Pass -peam to pax(1), so ownership and permissions that were set by (diff) | |
| download | wireguard-openbsd-a40bc605082ab4d4b0c58c934b7919719745bc84.tar.xz wireguard-openbsd-a40bc605082ab4d4b0c58c934b7919719745bc84.zip | |
Remove unused fields from ffs_opt_t.
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/ffs.c | 12 | ||||
| -rw-r--r-- | usr.sbin/makefs/ffs.h | 8 |
2 files changed, 2 insertions, 18 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) diff --git a/usr.sbin/makefs/ffs.h b/usr.sbin/makefs/ffs.h index 67b94e7275d..08da7971716 100644 --- a/usr.sbin/makefs/ffs.h +++ b/usr.sbin/makefs/ffs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.h,v 1.4 2016/10/22 16:51:52 natano Exp $ */ +/* $OpenBSD: ffs.h,v 1.5 2016/11/06 12:33:30 natano Exp $ */ /* $NetBSD: ffs.h,v 1.2 2011/10/09 21:33:43 christos Exp $ */ /* @@ -44,17 +44,11 @@ typedef struct { int bsize; /* block size */ int fsize; /* fragment size */ int cpg; /* cylinders per group */ - int cpgflg; /* cpg was specified by user */ int density; /* bytes per inode */ - int ntracks; /* number of tracks */ - int nsectors; /* number of sectors */ - int rpm; /* rpm */ int minfree; /* free space threshold */ int optimization; /* optimization (space or time) */ int maxcontig; /* max contiguous blocks to allocate */ - int rotdelay; /* rotational delay between blocks */ int maxbpg; /* maximum blocks per file in a cyl group */ - int nrpos; /* # of distinguished rotational positions */ int avgfilesize; /* expected average file size */ int avgfpdir; /* expected # of files per directory */ int version; /* filesystem version (1 = FFS, 2 = UFS2) */ |