summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/Makefile4
-rw-r--r--sbin/nfsiod/Makefile6
-rw-r--r--sbin/nfsiod/nfsiod.879
-rw-r--r--sbin/nfsiod/nfsiod.c181
4 files changed, 2 insertions, 268 deletions
diff --git a/sbin/Makefile b/sbin/Makefile
index da199ccc80a..d5282521a7c 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.51 2000/05/18 14:01:00 espie Exp $
+# $OpenBSD: Makefile,v 1.52 2000/05/19 16:41:52 mickey Exp $
# Not ported: XNSrouted enpload scsiformat startslip
# Missing: icheck
SUBDIR= atactl badsect brconfig ccdconfig disklabel dmesg fsck ifconfig init \
ipf ipfstat ipnat ipsecadm isakmpd kbd mknod modload modunload \
- mount mountd ncheck_ffs nfsd nfsiod nologin photurisd ping \
+ mount mountd ncheck_ffs nfsd nologin photurisd ping \
quotacheck raidctl reboot route routed savecore scan_ffs scsi \
shutdown slattach startkey swapctl sysctl ttyflags umount
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
deleted file mode 100644
index 9a16576df4f..00000000000
--- a/sbin/nfsiod/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 1997/09/21 11:37:49 deraadt Exp $
-
-PROG= nfsiod
-MAN= nfsiod.8
-
-.include <bsd.prog.mk>
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
deleted file mode 100644
index 57da8109c74..00000000000
--- a/sbin/nfsiod/nfsiod.8
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" $OpenBSD: nfsiod.8,v 1.10 2000/03/18 22:56:02 aaron Exp $
-.\" $NetBSD: nfsiod.8,v 1.6 1995/03/18 14:59:04 cgd Exp $
-.\"
-.\" Copyright (c) 1989, 1991, 1993
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" @(#)nfsiod.8 8.2 (Berkeley) 2/22/94
-.\"
-.Dd February 22, 1994
-.Dt NFSIOD 8
-.Os
-.Sh NAME
-.Nm nfsiod
-.Nd local
-.Tn NFS
-asynchronous I/O server
-.Sh SYNOPSIS
-.Nm nfsiod
-.Op Fl n Ar num_servers
-.Sh DESCRIPTION
-.Nm
-runs on an
-.Tn NFS
-client machine to service asynchronous I/O requests to its server.
-It improves performance but is not required for correct operation.
-.Pp
-Unless otherwise specified, a single server is started.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl n Ar num_servers
-Specify how many servers are to be started (max 20).
-.El
-.Pp
-A client should run enough daemons to handle its maximum
-level of concurrency, typically four to six.
-The system maximum is twenty.
-.Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
-.Sh SEE ALSO
-.Xr nfsstat 1 ,
-.Xr nfssvc 2 ,
-.Xr mountd 8 ,
-.Xr portmap 8
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Bx 4.4 .
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
deleted file mode 100644
index 4c217b40bf8..00000000000
--- a/sbin/nfsiod/nfsiod.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* $OpenBSD: nfsiod.c,v 1.7 1999/02/26 16:17:46 millert Exp $ */
-/* $NetBSD: nfsiod.c,v 1.12 1996/02/20 16:06:55 fvdl Exp $ */
-
-/*
- * Copyright (c) 1989, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif not lint
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nfsiod.c 8.4 (Berkeley) 5/3/95"
-#else
-static char rcsid[] = "$NetBSD: nfsiod.c,v 1.12 1996/02/20 16:06:55 fvdl Exp $";
-#endif
-#endif not lint
-
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/ucred.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/mount.h>
-
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <unistd.h>
-
-/* Global defs */
-#ifdef DEBUG
-int debug = 1;
-#else
-int debug = 0;
-#endif
-
-void nonfs __P((int));
-void reapchild __P((int));
-void usage __P((void));
-
-/*
- * Nfsiod does asynchronous buffered I/O on behalf of the NFS client.
- * It does not have to be running for correct operation, but will
- * improve throughput.
- */
-int
-main(argc, argv)
- int argc;
- char *argv[];
-{
- int ch, num_servers;
-
-#define MAXNFSIODCNT NFS_MAXASYNCDAEMON
-#define DEFNFSIODCNT 1
- num_servers = DEFNFSIODCNT;
- while ((ch = getopt(argc, argv, "n:")) != -1)
- switch (ch) {
- case 'n':
- num_servers = atoi(optarg);
- if (num_servers < 1 || num_servers > MAXNFSIODCNT) {
- warnx("nfsiod count %d; reset to %d",
- num_servers, DEFNFSIODCNT);
- num_servers = DEFNFSIODCNT;
- }
- break;
- case '?':
- default:
- usage();
- }
- argc -= optind;
- argv += optind;
-
- /*
- * XXX
- * Backward compatibility, trailing number is the count of daemons.
- */
- if (argc > 1)
- usage();
- if (argc == 1) {
- num_servers = atoi(argv[0]);
- if (num_servers < 1 || num_servers > MAXNFSIODCNT) {
- warnx("nfsiod count %d; reset to %d",
- num_servers, DEFNFSIODCNT);
- num_servers = DEFNFSIODCNT;
- }
- }
-
- if (debug == 0) {
- daemon(0, 0);
- (void)signal(SIGHUP, SIG_IGN);
- (void)signal(SIGINT, SIG_IGN);
- (void)signal(SIGQUIT, SIG_IGN);
- (void)signal(SIGSYS, nonfs);
- }
- (void)signal(SIGCHLD, reapchild);
-
- openlog("nfsiod:", LOG_PID, LOG_DAEMON);
-
- while (num_servers--)
- switch (fork()) {
- case -1:
- syslog(LOG_ERR, "fork: %m");
- exit(1);
- case 0:
- if (nfssvc(NFSSVC_BIOD, NULL) < 0) {
- syslog(LOG_ERR, "nfssvc: %m");
- exit(1);
- }
- exit(0);
- }
- exit(0);
-}
-
-void
-nonfs(signo)
- int signo;
-{
- syslog(LOG_ERR, "missing system call: NFS not available.");
-}
-
-void
-reapchild(signo)
- int signo;
-{
- int save_errno = errno;
-
- while (wait3(NULL, WNOHANG, NULL) > 0)
- ;
- errno = save_errno;
-}
-
-void
-usage()
-{
- (void)fprintf(stderr, "usage: nfsiod [-n num_servers]\n");
- exit(1);
-}