Clean up FFS option handling somewhat; no functional change.

3 files changed, 11 insertions, 22 deletions

diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 46629c16123..93706e49bfc 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.c,v 1.25 2016/11/11 09:27:31 natano Exp $	*/
+/*	$OpenBSD: ffs.c,v 1.26 2016/11/11 09:54:07 natano Exp $	*/
 /*	$NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $	*/
 
 /*
@@ -147,15 +147,14 @@ ffs_prep_opts(fsinfo_t *fsopts)
 	    { .name = NULL }
 	};
 
-	ffs_opts->bsize= -1;
-	ffs_opts->fsize= -1;
-	ffs_opts->density= -1;
-	ffs_opts->minfree= -1;
+	ffs_opts->bsize = -1;
+	ffs_opts->fsize = -1;
+	ffs_opts->density = -1;
+	ffs_opts->minfree = MINFREE;
 	ffs_opts->optimization = FS_OPTSPACE;
-	ffs_opts->maxcontig= -1;
-	ffs_opts->maxbpg= -1;
-	ffs_opts->avgfilesize= -1;
-	ffs_opts->avgfpdir= -1;
+	ffs_opts->maxbpg = -1;
+	ffs_opts->avgfilesize = AVFILESIZ;
+	ffs_opts->avgfpdir = AFPDIR;
 	ffs_opts->version = 1;
 	ffs_opts->lp = NULL;
 
@@ -326,18 +325,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts)
 	if (ffs_opts->bsize == -1)
 		ffs_opts->bsize = MIN(DFL_BLKSIZE, 8 * ffs_opts->fsize);
 				/* fsopts->density is set below */
-	if (ffs_opts->minfree == -1)
-		ffs_opts->minfree = MINFREE;
-	if (ffs_opts->maxcontig == -1)
-		ffs_opts->maxcontig =
-		    MAX(1, MIN(MAXBSIZE, FFS_MAXBSIZE) / ffs_opts->bsize);
 	/* XXX ondisk32 */
 	if (ffs_opts->maxbpg == -1)
 		ffs_opts->maxbpg = ffs_opts->bsize / sizeof(int32_t);
-	if (ffs_opts->avgfilesize == -1)
-		ffs_opts->avgfilesize = AVFILESIZ;
-	if (ffs_opts->avgfpdir == -1)
-		ffs_opts->avgfpdir = AFPDIR;
 
 		/* calculate size of tree */
 	ffs_size_dir(root, fsopts);
diff --git a/usr.sbin/makefs/ffs.h b/usr.sbin/makefs/ffs.h
index ea73f3f5d01..59b046e5767 100644
--- a/usr.sbin/makefs/ffs.h
+++ b/usr.sbin/makefs/ffs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.h,v 1.7 2016/11/10 08:26:38 natano Exp $	*/
+/*	$OpenBSD: ffs.h,v 1.8 2016/11/11 09:54:07 natano Exp $	*/
 /*	$NetBSD: ffs.h,v 1.2 2011/10/09 21:33:43 christos Exp $	*/
 
 /*
@@ -46,7 +46,6 @@ typedef struct {
 	int	density;	/* bytes per inode */
 	int	minfree;	/* free space threshold */
 	int	optimization;	/* optimization (space or time) */
-	int	maxcontig;	/* max contiguous blocks to allocate */
 	int	maxbpg;		/* maximum blocks per file in a cyl group */
 	int	avgfilesize;	/* expected average file size */
 	int	avgfpdir;	/* expected # of files per directory */
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index badebc654e6..2f53207c9f0 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs.c,v 1.12 2016/10/26 15:31:13 natano Exp $	*/
+/*	$OpenBSD: mkfs.c,v 1.13 2016/11/11 09:54:07 natano Exp $	*/
 /*	$NetBSD: mkfs.c,v 1.34 2016/06/24 19:24:11 christos Exp $	*/
 
 /*
@@ -126,7 +126,7 @@ ffs_mkfs(const char *fsys, const fsinfo_t *fsopts, time_t tstamp)
 	minfree =       ffs_opts->minfree;
 	opt =           ffs_opts->optimization;
 	density =       ffs_opts->density;
-	maxcontig =     ffs_opts->maxcontig;
+	maxcontig =	MAX(1, MIN(MAXBSIZE, FFS_MAXBSIZE) / bsize);
 	maxbpg =        ffs_opts->maxbpg;
 	avgfilesize =   ffs_opts->avgfilesize;
 	avgfpdir =      ffs_opts->avgfpdir;