diff options
| author | Maxime Henrion <mux@FreeBSD.org> | 2002-08-03 16:03:21 +0000 |
|---|---|---|
| committer | Maxime Henrion <mux@FreeBSD.org> | 2002-08-03 16:03:21 +0000 |
| commit | 526ba6d32b79b714f8c5cd54892d80b60b24f9a4 (patch) | |
| tree | 767cb1c371d1f8a92f24d3039b035dc1af421bc6 /sbin/mount | |
| parent | 5740f28044897562fedf09bea0c6a547aa3701d4 (diff) | |
| download | src-526ba6d32b79b714f8c5cd54892d80b60b24f9a4.tar.gz src-526ba6d32b79b714f8c5cd54892d80b60b24f9a4.zip | |
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.
Notes
Notes:
svn path=/head/; revision=101270
Diffstat (limited to 'sbin/mount')
| -rw-r--r-- | sbin/mount/mount_ufs.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c index dee0ddf5db88..f15ef9aa9600 100644 --- a/sbin/mount/mount_ufs.c +++ b/sbin/mount/mount_ufs.c @@ -79,8 +79,6 @@ mount_ufs(argc, argv) struct ufs_args args; int ch, mntflags; char *fs_name; - struct vfsconf vfc; - int error = 0; mntflags = 0; optind = optreset = 1; /* Reset for parse of new argv. */ @@ -109,21 +107,7 @@ mount_ufs(argc, argv) else args.export.ex_flags = 0; - error = getvfsbyname("ufs", &vfc); - if (error && vfsisloadable("ufs")) { - if (vfsload("ufs")) { - warn("vfsload(ufs)"); - return (1); - } - endvfsent(); /* flush old table */ - error = getvfsbyname("ufs", &vfc); - } - if (error) { - warnx("ufs filesystem is not available"); - return (1); - } - - if (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0) { + if (mount("ufs", fs_name, mntflags, &args) < 0) { switch (errno) { case EMFILE: warnx("%s on %s: mount table full", |