[src/trunk]: src/sys/lib/libsa Don't load filessytem module for filesystem th...

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

details:   https://anonhg.NetBSD.org/src/rev/a88fcd14c0b4
branches:  trunk
changeset: 365766:a88fcd14c0b4
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Apr 24 06:52:59 2022 +0000

description:
Don't load filessytem module for filesystem that was found but isn't used
for booting.

diffstat:

 sys/lib/libsa/ffsv1.c   |  7 +++----
 sys/lib/libsa/ffsv2.c   |  7 +++----
 sys/lib/libsa/files.c   |  3 ++-
 sys/lib/libsa/globals.c |  3 +--
 sys/lib/libsa/ufs.c     |  6 ++++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (93 lines):

diff -r 3b394d3e31a5 -r a88fcd14c0b4 sys/lib/libsa/ffsv1.c
--- a/sys/lib/libsa/ffsv1.c     Sun Apr 24 06:49:38 2022 +0000
+++ b/sys/lib/libsa/ffsv1.c     Sun Apr 24 06:52:59 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv1.c,v 1.8 2021/05/27 06:54:44 mrg Exp $ */
+/* $NetBSD: ffsv1.c,v 1.9 2022/04/24 06:52:59 mlelstv Exp $ */
 
 #define LIBSA_FFSv1
 
@@ -19,8 +19,7 @@
 
 #define FS_MAGIC FS_UFS1_MAGIC
 
-#if 0
-#define        FSMOD   "wapbl/ufs/ffs"
-#endif
+/* #define     FSMOD   "wapbl/ufs/ffs" */
+#define        FSMOD   NULL
 
 #include "ufs.c"
diff -r 3b394d3e31a5 -r a88fcd14c0b4 sys/lib/libsa/ffsv2.c
--- a/sys/lib/libsa/ffsv2.c     Sun Apr 24 06:49:38 2022 +0000
+++ b/sys/lib/libsa/ffsv2.c     Sun Apr 24 06:52:59 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv2.c,v 1.8 2021/05/27 06:54:44 mrg Exp $ */
+/* $NetBSD: ffsv2.c,v 1.9 2022/04/24 06:52:59 mlelstv Exp $ */
 
 #define LIBSA_FFSv2
 
@@ -19,8 +19,7 @@
 
 #define FS_MAGIC FS_UFS2_MAGIC
 
-#if 0
-#define        FSMOD   "wapbl/ufs/ffs"
-#endif
+/* #define     FSMOD   "wapbl/ufs/ffs" */
+#define        FSMOD   NULL
 
 #include "ufs.c"
diff -r 3b394d3e31a5 -r a88fcd14c0b4 sys/lib/libsa/files.c
--- a/sys/lib/libsa/files.c     Sun Apr 24 06:49:38 2022 +0000
+++ b/sys/lib/libsa/files.c     Sun Apr 24 06:52:59 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.1 2002/03/15 13:23:34 simonb Exp $ */
+/* $NetBSD: files.c,v 1.2 2022/04/24 06:52:59 mlelstv Exp $ */
 
 /*
  *     files.c:
@@ -10,3 +10,4 @@
 #include "stand.h"
 
 struct open_file files[SOPEN_MAX];
+const char *fsmod = NULL;      /* file system module name to load */
diff -r 3b394d3e31a5 -r a88fcd14c0b4 sys/lib/libsa/globals.c
--- a/sys/lib/libsa/globals.c   Sun Apr 24 06:49:38 2022 +0000
+++ b/sys/lib/libsa/globals.c   Sun Apr 24 06:52:59 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: globals.c,v 1.11 2014/03/29 14:30:16 jakllsch Exp $    */
+/*     $NetBSD: globals.c,v 1.12 2022/04/24 06:52:59 mlelstv Exp $     */
 
 /*
  *     globals.c:
@@ -20,7 +20,6 @@
 char   rootpath[FNAME_SIZE];           /* root mount path */
 char   bootfile[FNAME_SIZE];           /* bootp says to boot this */
 char   hostname[FNAME_SIZE];           /* our hostname */
-const 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 3b394d3e31a5 -r a88fcd14c0b4 sys/lib/libsa/ufs.c
--- a/sys/lib/libsa/ufs.c       Sun Apr 24 06:49:38 2022 +0000
+++ b/sys/lib/libsa/ufs.c       Sun Apr 24 06:52:59 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs.c,v 1.82 2022/04/24 06:48:15 mlelstv Exp $ */
+/*     $NetBSD: ufs.c,v 1.83 2022/04/24 06:52:59 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -857,9 +857,11 @@
 out:
        if (rc)
                ufs_close(f);
-#ifdef FSMOD           /* Only defined for lfs */
        else
+#ifdef FSMOD
                fsmod = FSMOD;
+#else
+               fsmod = NULL;
 #endif
        return rc;
 }