[src/netbsd-2-0]: src/usr.sbin/makefs Pullup rev 1.28 (requested by dsl in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/c57ffacd8472
branches:  netbsd-2-0
changeset: 560610:c57ffacd8472
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Apr 28 06:00:41 2004 +0000

description:
Pullup rev 1.28 (requested by dsl in ticket #200)

Allow for ROOTINO when deciding whether their are enough inodes in the
created filesystem.  Otherwise this fails when asked for 63 inodes for
i386 ramdisk-big.

diffstat:

 usr.sbin/makefs/ffs.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r ad28de6692a4 -r c57ffacd8472 usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Wed Apr 28 05:59:53 2004 +0000
+++ b/usr.sbin/makefs/ffs.c     Wed Apr 28 06:00:41 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.25 2003/10/26 10:32:35 mycroft Exp $ */
+/*     $NetBSD: ffs.c,v 1.25.2.1 2004/04/28 06:00:41 jmc Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.25 2003/10/26 10:32:35 mycroft Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.25.2.1 2004/04/28 06:00:41 jmc Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -474,11 +474,11 @@
                    (long long)fs->fs_cstotal.cs_ndir);
        }
 
-       if (fs->fs_cstotal.cs_nifree < fsopts->inodes) {
+       if (fs->fs_cstotal.cs_nifree + ROOTINO < fsopts->inodes) {
                warnx(
                "Image file `%s' has %lld free inodes; %lld are required.",
                    image,
-                   (long long)fs->fs_cstotal.cs_nifree,
+                   (long long)fs->fs_cstotal.cs_nifree + ROOTINO,
                    (long long)fsopts->inodes);
                return (-1);
        }