[src/trunk]: src/usr.sbin/makefs for consistency with ffs, don't count the of...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b949bed6f3e8
branches:  trunk
changeset: 823137:b949bed6f3e8
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 13 17:20:59 2017 +0000

description:
for consistency with ffs, don't count the offset into the size.

diffstat:

 usr.sbin/makefs/msdos.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 69cb43351526 -r b949bed6f3e8 usr.sbin/makefs/msdos.c
--- a/usr.sbin/makefs/msdos.c   Thu Apr 13 17:10:12 2017 +0000
+++ b/usr.sbin/makefs/msdos.c   Thu Apr 13 17:20:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdos.c,v 1.18 2017/02/16 22:44:06 christos Exp $      */
+/*     $NetBSD: msdos.c,v 1.19 2017/04/13 17:20:59 christos Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.18 2017/02/16 22:44:06 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.19 2017/04/13 17:20:59 christos Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -157,12 +157,9 @@
        assert(root != NULL);
        assert(fsopts != NULL);
 
-       /*
-        * XXX: pick up other options from the msdos specific ones?
-        * Is minsize right here?
-        */
+       fsopts->size = fsopts->offset + fsopts->maxsize;
        msdos_opt->options.create_size = MAX(msdos_opt->options.create_size,
-               fsopts->minsize);
+               fsopts->size);
        msdos_opt->options.offset = fsopts->offset;
        if (msdos_opt->options.bytes_per_sector == 0) {
                if (fsopts->sectorsize == -1)