Now that the kernel is able to load modules itself,

remove all the code which was trying to do so.
This code was nasty in several ways, it was hiding
the kernel bug where the kernel was unable to properly
load a module, and it was quitting if it wasn't able
to load the module.  The consequence is that an ABI
breakage of the vfsconf API would have broken *every*
mount utility.

2 files changed, 1 insertions, 23 deletions

diff --git a/usr.sbin/mount_nwfs/mount_nwfs.c b/usr.sbin/mount_nwfs/mount_nwfs.c
index 8e37b09..af00071 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.c
+++ b/usr.sbin/mount_nwfs/mount_nwfs.c
@@ -76,7 +76,6 @@ main(int argc, char *argv[]) {
 	struct nwfs_args mdata;
 	struct ncp_conn_loginfo li;
 	struct stat st;
-	struct vfsconf vfc;
 	struct nw_entry_info einfo;
 	struct tm *tm;
 	time_t ltime;
@@ -97,16 +96,6 @@ main(int argc, char *argv[]) {
 		}
 	}
 
-	error = getvfsbyname(NWFS_VFSNAME, &vfc);
-	if (error && vfsisloadable(NWFS_VFSNAME)) {
-		if(vfsload(NWFS_VFSNAME))
-			err(EX_OSERR, "vfsload("NWFS_VFSNAME")");
-		endvfsent();
-		error = getvfsbyname(NWFS_VFSNAME, &vfc);
-	}
-	if (error)
-		errx(EX_OSERR, "NetWare filesystem is not available");
-
 	if(ncp_initlib()) exit(1);
 
 	mntflags = error = 0;
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index c07eed9..baad22f 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -108,7 +108,6 @@ main(argc, argv)
 	char mountpt[MAXPATHLEN];
 	int mntflags = 0;
 	char tag[32];
-	struct vfsconf vfc;
 	mode_t um;
 
 	qelem q;
@@ -175,17 +174,7 @@ main(argc, argv)
 	sprintf(tag, "portal:%d", getpid());
 	args.pa_config = tag;
 
-	error = getvfsbyname("portalfs", &vfc);
-	if (error && vfsisloadable("portalfs")) {
-		if (vfsload("portalfs"))
-			err(EX_OSERR, "vfsload(portalfs)");
-		endvfsent();
-		error = getvfsbyname("portalfs", &vfc);
-	}
-	if (error)
-		errx(EX_OSERR, "portal filesystem is not available");
-
-	rc = mount(vfc.vfc_name, mountpt, mntflags, &args);
+	rc = mount("portalfs", mountpt, mntflags, &args);
 	if (rc < 0)
 		err(1, NULL);