From: krw <krw@openbsd.org>
Date: Mon, 25 Jul 2016 15:30:36 +0000 (+0000)
Subject: Revert change to density calculation. David Vasek points out this
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1f7812f8186400f73c0d48ebbeec210c398e6db6;p=openbsd

Revert change to density calculation. David Vasek points out this
is a more complicated problem than it appears.

ok deraadt@
---

diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 69f480d320b..21145752b9a 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.107 2016/07/23 09:12:33 krw Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.108 2016/07/25 15:30:36 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) / (sectorsize / DEV_BSIZE);
+		density = NFPI * fsize;
 	if (minfree < MINFREE && opt != FS_OPTSPACE && reqopt == -1) {
 		warnx("warning: changing optimization to space "
 		    "because minfree is less than %d%%\n", MINFREE);