diff options
Diffstat (limited to 'sbin/nfsiod')
| -rw-r--r-- | sbin/nfsiod/Makefile | 1 | ||||
| -rw-r--r-- | sbin/nfsiod/nfsiod.8 | 6 | ||||
| -rw-r--r-- | sbin/nfsiod/nfsiod.c | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile index 47cd290..22717c5 100644 --- a/sbin/nfsiod/Makefile +++ b/sbin/nfsiod/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PROG= nfsiod +WARNS?= 6 MAN= nfsiod.8 .include <bsd.prog.mk> diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8 index 281c675..9131f41 100644 --- a/sbin/nfsiod/nfsiod.8 +++ b/sbin/nfsiod/nfsiod.8 @@ -69,9 +69,7 @@ detects that the running kernel does not include support, it will attempt to load a loadable kernel module containing .Tn NFS code, using -.Xr kldload 8 -by way of -.Xr vfsload 3 . +.Xr kldload 2 . If this fails, or no .Tn NFS KLD was available, @@ -81,8 +79,8 @@ exits with an error. .Ex -std .Sh SEE ALSO .Xr nfsstat 1 , +.Xr kldload 2 , .Xr nfssvc 2 , -.Xr kldload 8 , .Xr mountd 8 , .Xr nfsd 8 , .Xr rpcbind 8 diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c index 547e238..15e5f76 100644 --- a/sbin/nfsiod/nfsiod.c +++ b/sbin/nfsiod/nfsiod.c @@ -51,6 +51,7 @@ static const char rcsid[] = #include <sys/param.h> #include <sys/syslog.h> #include <sys/wait.h> +#include <sys/linker.h> #include <sys/mount.h> #include <sys/time.h> #include <sys/sysctl.h> @@ -73,16 +74,15 @@ int main(int argc, char *argv[]) { int ch; - struct vfsconf vfc; + struct xvfsconf vfc; int error; unsigned int iodmin, iodmax, num_servers; size_t len; error = getvfsbyname("nfs", &vfc); - if (error && vfsisloadable("nfs")) { - if (vfsload("nfs")) - err(1, "vfsload(nfs)"); - endvfsent(); /* flush cache */ + if (error) { + if (kldload("nfs")) + err(1, "kldload(nfs)"); error = getvfsbyname("nfs", &vfc); } if (error) |
