From: krw <krw@openbsd.org>
Date: Sat, 23 Jul 2016 09:12:33 +0000 (+0000)
Subject: At n2k16 David Vasek pointed out that FFS partitions on 4K disks are
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4f21f8ec788252158c619caa603514d53f1f46d6;p=openbsd

At n2k16 David Vasek pointed out that FFS partitions on 4K disks are
created with far fewer inodes than DEV_BSIZE devices.

Scale the default 'density' value by (sector size)/DEV_BSIZE to
create the same number of inodes. Obviously a NO-OP on DEV_BSIZE
devices.

Thanks David!

ok deraadt@
---

diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index e0bc0c96612..69f480d320b 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.106 2016/05/31 16:41:08 deraadt Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.107 2016/07/23 09:12:33 krw Exp $	*/
 /*	$NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $	*/
 
 /*
@@ -482,7 +482,7 @@ havelabel:
 			bsize = MINIMUM(DFL_BLKSIZE, 8 * fsize);
 	}
 	if (density == 0)
-		density = NFPI * fsize;
+		density = (NFPI * fsize) / (sectorsize / DEV_BSIZE);
 	if (minfree < MINFREE && opt != FS_OPTSPACE && reqopt == -1) {
 		warnx("warning: changing optimization to space "
 		    "because minfree is less than %d%%\n", MINFREE);