Module Name: src
Committed By: mlelstv
Date: Sun Apr 24 06:52:59 UTC 2022
Modified Files:
src/sys/lib/libsa: ffsv1.c ffsv2.c files.c globals.c ufs.c
Log Message:
Don't load filessytem module for filesystem that was found but isn't used
for booting.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libsa/ffsv1.c src/sys/lib/libsa/ffsv2.c
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libsa/files.c
cvs rdiff -u -r1.11 -r1.12 src/sys/lib/libsa/globals.c
cvs rdiff -u -r1.82 -r1.83 src/sys/lib/libsa/ufs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/ffsv1.c
diff -u src/sys/lib/libsa/ffsv1.c:1.8 src/sys/lib/libsa/ffsv1.c:1.9
--- src/sys/lib/libsa/ffsv1.c:1.8 Thu May 27 06:54:44 2021
+++ src/sys/lib/libsa/ffsv1.c Sun Apr 24 06:52:59 2022
@@ -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"
Index: src/sys/lib/libsa/ffsv2.c
diff -u src/sys/lib/libsa/ffsv2.c:1.8 src/sys/lib/libsa/ffsv2.c:1.9
--- src/sys/lib/libsa/ffsv2.c:1.8 Thu May 27 06:54:44 2021
+++ src/sys/lib/libsa/ffsv2.c Sun Apr 24 06:52:59 2022
@@ -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"
Index: src/sys/lib/libsa/files.c
diff -u src/sys/lib/libsa/files.c:1.1 src/sys/lib/libsa/files.c:1.2
--- src/sys/lib/libsa/files.c:1.1 Fri Mar 15 13:23:34 2002
+++ src/sys/lib/libsa/files.c Sun Apr 24 06:52:59 2022
@@ -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 */
Index: src/sys/lib/libsa/globals.c
diff -u src/sys/lib/libsa/globals.c:1.11 src/sys/lib/libsa/globals.c:1.12
--- src/sys/lib/libsa/globals.c:1.11 Sat Mar 29 14:30:16 2014
+++ src/sys/lib/libsa/globals.c Sun Apr 24 06:52:59 2022
@@ -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 @@ u_char bcea[ETHER_ADDR_LEN] = BA; /* bro
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 */
Index: src/sys/lib/libsa/ufs.c
diff -u src/sys/lib/libsa/ufs.c:1.82 src/sys/lib/libsa/ufs.c:1.83
--- src/sys/lib/libsa/ufs.c:1.82 Sun Apr 24 06:48:15 2022
+++ src/sys/lib/libsa/ufs.c Sun Apr 24 06:52:59 2022
@@ -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 @@ ufs_open(const char *path, struct open_f
out:
if (rc)
ufs_close(f);
-#ifdef FSMOD /* Only defined for lfs */
else
+#ifdef FSMOD
fsmod = FSMOD;
+#else
+ fsmod = NULL;
#endif
return rc;
}
