[src/trunk]: src/sys Remove the code that tries to load the "ffs" kernel modu...

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

details:   https://anonhg.NetBSD.org/src/rev/1afa028c4992
branches:  trunk
changeset: 779350:1afa028c4992
user:      dsl <dsl%NetBSD.org@localhost>
date:      Mon May 21 21:34:16 2012 +0000

description:
Remove the code that tries to load the "ffs" kernel module during boot.
This is in line with the core decision than even modular kernels should
  contain the ffs code.
I've left in the code that tries to load "nfs" and "ext2fs", but it
  isn't clear that is necessary.
Removes a warning message that (usually) flashes past to fast to read.
AFAICT all the relevant kernels contain ffs (and nfs for that matter).

diffstat:

 sys/arch/i386/stand/lib/exec.c          |   9 ++++-----
 sys/arch/sandpoint/stand/altboot/main.c |   7 +++----
 sys/lib/libsa/ext2fs.c                  |   6 ++----
 sys/lib/libsa/ffsv1.c                   |   4 +---
 sys/lib/libsa/ffsv2.c                   |   4 +---
 sys/lib/libsa/globals.c                 |   5 ++---
 sys/lib/libsa/lfsv1.c                   |   3 +--
 sys/lib/libsa/lfsv2.c                   |   3 +--
 sys/lib/libsa/stand.h                   |   3 +--
 sys/lib/libsa/ufs.c                     |  10 +++-------
 10 files changed, 19 insertions(+), 35 deletions(-)

diffs (191 lines):

diff -r d8ac79233fcc -r 1afa028c4992 sys/arch/i386/stand/lib/exec.c
--- a/sys/arch/i386/stand/lib/exec.c    Mon May 21 21:15:39 2012 +0000
+++ b/sys/arch/i386/stand/lib/exec.c    Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec.c,v 1.49 2011/11/28 07:56:54 tls Exp $     */
+/*     $NetBSD: exec.c,v 1.50 2012/05/21 21:34:16 dsl Exp $     */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -297,10 +297,9 @@
 
        close(fd);
 
-       /* Now we know the root fs type, load modules for it. */
-       module_add(fsmod);
-       if (fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0)
-               module_add(fsmod2);
+       /* If the root fs type is unusual, load its module. */
+       if (fsmod != NULL)
+               module_add(fsmod);
 
        /*
         * Gather some information for the kernel. Do this after the
diff -r d8ac79233fcc -r 1afa028c4992 sys/arch/sandpoint/stand/altboot/main.c
--- a/sys/arch/sandpoint/stand/altboot/main.c   Mon May 21 21:15:39 2012 +0000
+++ b/sys/arch/sandpoint/stand/altboot/main.c   Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.20 2012/04/27 00:35:43 nisimura Exp $ */
+/* $NetBSD: main.c,v 1.21 2012/05/21 21:34:16 dsl Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -353,9 +353,8 @@
                }
 
                if (modules_enabled) {
-                       module_add(fsmod);
-                       if (fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0)
-                               module_add(fsmod2);
+                       if (fsmod != NULL)
+                               module_add(fsmod);
                        kmodloadp = marks[MARK_END];
                        btinfo_modulelist = NULL;
                        module_load(bname);
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/ext2fs.c
--- a/sys/lib/libsa/ext2fs.c    Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/ext2fs.c    Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs.c,v 1.12 2012/01/16 18:44:13 christos Exp $     */
+/*     $NetBSD: ext2fs.c,v 1.13 2012/05/21 21:34:16 dsl Exp $  */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -713,10 +713,8 @@
 out:
        if (rc)
                ext2fs_close(f);
-       else {
+       else
                fsmod = "ext2fs";
-               fsmod2 = "ffs";
-       }
        return rc;
 }
 
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/ffsv1.c
--- a/sys/lib/libsa/ffsv1.c     Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/ffsv1.c     Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv1.c,v 1.5 2011/12/25 06:09:08 tsutsui Exp $ */
+/* $NetBSD: ffsv1.c,v 1.6 2012/05/21 21:34:16 dsl Exp $ */
 
 #define LIBSA_FFSv1
 
@@ -15,6 +15,4 @@
 #define ufs_dinode     ufs1_dinode
 #define indp_t         int32_t
 
-#define        FSMOD           "ffs"
-
 #include "ufs.c"
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/ffsv2.c
--- a/sys/lib/libsa/ffsv2.c     Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/ffsv2.c     Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv2.c,v 1.5 2011/12/25 06:09:08 tsutsui Exp $ */
+/* $NetBSD: ffsv2.c,v 1.6 2012/05/21 21:34:16 dsl Exp $ */
 
 #define LIBSA_FFSv2
 
@@ -15,6 +15,4 @@
 #define ufs_dinode     ufs2_dinode
 #define indp_t         int64_t
 
-#define        FSMOD           "ffs"
-
 #include "ufs.c"
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/globals.c
--- a/sys/lib/libsa/globals.c   Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/globals.c   Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: globals.c,v 1.8 2008/11/19 12:36:41 ad Exp $   */
+/*     $NetBSD: globals.c,v 1.9 2012/05/21 21:34:16 dsl Exp $  */
 
 /*
  *     globals.c:
@@ -19,8 +19,7 @@
 char   rootpath[FNAME_SIZE];           /* root mount path */
 char   bootfile[FNAME_SIZE];           /* bootp says to boot this */
 char   hostname[FNAME_SIZE];           /* our hostname */
-char   *fsmod =  "ffs";                /* guessed file system module name */
-char   *fsmod2;                        /* a requisite module */
+char   *fsmod = NULL;                  /*  file system module name to load */
 struct in_addr myip;                   /* my ip address */
 struct in_addr rootip;                 /* root ip address */
 struct in_addr gateip;                 /* swap ip address */
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/lfsv1.c
--- a/sys/lib/libsa/lfsv1.c     Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/lfsv1.c     Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfsv1.c,v 1.4 2011/12/25 06:09:08 tsutsui Exp $ */
+/* $NetBSD: lfsv1.c,v 1.5 2012/05/21 21:34:16 dsl Exp $ */
 
 #define        LIBSA_LFS
 #define        REQUIRED_LFS_VERSION    1
@@ -20,6 +20,5 @@
 #define        INOPBx(fs) INOPB(fs)
 
 #define        FSMOD                   "lfs"
-#define        FSMOD2                  "ffs"
 
 #include "lib/libsa/ufs.c"
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/lfsv2.c
--- a/sys/lib/libsa/lfsv2.c     Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/lfsv2.c     Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfsv2.c,v 1.4 2011/12/25 06:09:08 tsutsui Exp $ */
+/* $NetBSD: lfsv2.c,v 1.5 2012/05/21 21:34:16 dsl Exp $ */
 
 #define        LIBSA_LFS
 #define        REQUIRED_LFS_VERSION    2
@@ -23,6 +23,5 @@
 #endif
 
 #define        FSMOD                   "lfs"
-#define        FSMOD2                  "ffs"
 
 #include "lib/libsa/ufs.c"
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/stand.h
--- a/sys/lib/libsa/stand.h     Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/stand.h     Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stand.h,v 1.75 2012/01/16 18:44:13 christos Exp $      */
+/*     $NetBSD: stand.h,v 1.76 2012/05/21 21:34:16 dsl Exp $   */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -111,7 +111,6 @@
  * independent way.
  */
 extern char *fsmod;
-extern char *fsmod2;
 
 #if !defined(LIBSA_SINGLE_FILESYSTEM)
 struct fs_ops {
diff -r d8ac79233fcc -r 1afa028c4992 sys/lib/libsa/ufs.c
--- a/sys/lib/libsa/ufs.c       Mon May 21 21:15:39 2012 +0000
+++ b/sys/lib/libsa/ufs.c       Mon May 21 21:34:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs.c,v 1.57 2012/01/16 18:44:13 christos Exp $        */
+/*     $NetBSD: ufs.c,v 1.58 2012/05/21 21:34:16 dsl Exp $     */
 
 /*-
  * Copyright (c) 1993
@@ -770,14 +770,10 @@
 out:
        if (rc)
                ufs_close(f);
-       else {
-#ifdef FSMOD
+#ifdef FSMOD           /* Only defined for lfs */
+       else
                fsmod = FSMOD;
 #endif
-#ifdef FSMOD2
-               fsmod2 = FSMOD2;
-#endif
-       }
        return rc;
 }