From f68f7967f518af0f624563255f2d9cd174f46e5b Mon Sep 17 00:00:00 2001
From: natano <natano@openbsd.org>
Date: Thu, 10 Nov 2016 08:26:38 +0000
Subject: Remove the unused cpg field from ffs_opt_t.

---
 usr.sbin/makefs/ffs.c | 6 +-----
 usr.sbin/makefs/ffs.h | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'usr.sbin/makefs')

diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index fdba04ff06a..9e301a36bd3 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.c,v 1.22 2016/11/08 19:38:57 natano Exp $	*/
+/*	$OpenBSD: ffs.c,v 1.23 2016/11/10 08:26:38 natano Exp $	*/
 /*	$NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $	*/
 
 /*
@@ -101,7 +101,6 @@
 #define	DFL_FRAGSIZE		1024		/* fragment size */
 #define	DFL_BLKSIZE		8192		/* block size */
 #define	DFL_SECSIZE		512		/* sector size */
-#define	DFL_CYLSPERGROUP	65536		/* cylinders per group */
 
 
 typedef struct {
@@ -150,7 +149,6 @@ ffs_prep_opts(fsinfo_t *fsopts)
 
 	ffs_opts->bsize= -1;
 	ffs_opts->fsize= -1;
-	ffs_opts->cpg= -1;
 	ffs_opts->density= -1;
 	ffs_opts->minfree= -1;
 	ffs_opts->optimization= -1;
@@ -327,8 +325,6 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts)
 		ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize);
 	if (ffs_opts->bsize == -1)
 		ffs_opts->bsize = MIN(DFL_BLKSIZE, 8 * ffs_opts->fsize);
-	if (ffs_opts->cpg == -1)
-		ffs_opts->cpg = DFL_CYLSPERGROUP;
 				/* fsopts->density is set below */
 	if (ffs_opts->minfree == -1)
 		ffs_opts->minfree = MINFREE;
diff --git a/usr.sbin/makefs/ffs.h b/usr.sbin/makefs/ffs.h
index 1dec5b13438..ea73f3f5d01 100644
--- a/usr.sbin/makefs/ffs.h
+++ b/usr.sbin/makefs/ffs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.h,v 1.6 2016/11/08 19:22:29 natano Exp $	*/
+/*	$OpenBSD: ffs.h,v 1.7 2016/11/10 08:26:38 natano Exp $	*/
 /*	$NetBSD: ffs.h,v 1.2 2011/10/09 21:33:43 christos Exp $	*/
 
 /*
@@ -43,7 +43,6 @@ typedef struct {
 	char	label[MAXVOLLEN];	/* volume name/label */
 	int	bsize;		/* block size */
 	int	fsize;		/* fragment size */
-	int	cpg;		/* cylinders per group */
 	int	density;	/* bytes per inode */
 	int	minfree;	/* free space threshold */
 	int	optimization;	/* optimization (space or time) */
-- 
cgit v1.2.3-59-g8ed1b