Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin Remove nfsiod, it is no longer needed.



details:   https://anonhg.NetBSD.org/src/rev/63685efa5f82
branches:  trunk
changeset: 484957:63685efa5f82
user:      tsarna <tsarna%NetBSD.org@localhost>
date:      Sat Apr 15 21:29:49 2000 +0000

description:
Remove nfsiod, it is no longer needed.

diffstat:

 usr.sbin/Makefile        |    4 +-
 usr.sbin/nfsiod/Makefile |    7 -
 usr.sbin/nfsiod/nfsiod.8 |   77 -------------------
 usr.sbin/nfsiod/nfsiod.c |  181 -----------------------------------------------
 4 files changed, 2 insertions(+), 267 deletions(-)

diffs (295 lines):

diff -r 81c005510af5 -r 63685efa5f82 usr.sbin/Makefile
--- a/usr.sbin/Makefile Sat Apr 15 21:23:02 2000 +0000
+++ b/usr.sbin/Makefile Sat Apr 15 21:29:49 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.138 2000/03/15 12:01:19 soren Exp $
+#      $NetBSD: Makefile,v 1.139 2000/04/15 21:29:49 tsarna Exp $
 #      from: @(#)Makefile      5.20 (Berkeley) 6/12/93
 
 # XXX Temporary for BUILD_POSTFIX
@@ -15,7 +15,7 @@
        kvm_mkdb lastlogin link lpr mailwrapper map-mbone \
        mdconfig mdsetimage \
        memswitch mopd mountd mrinfo mrouted mtrace mtree \
-       netgroup_mkdb nfsd nfsiod pkg_install portmap pppd pstat \
+       netgroup_mkdb nfsd pkg_install portmap pppd pstat \
        pwd_mkdb quot quotacheck quotaon rarpd rbootd rdate \
        repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
        rpc.statd rpc.yppasswdd rwhod sa screenblank sesd \
diff -r 81c005510af5 -r 63685efa5f82 usr.sbin/nfsiod/Makefile
--- a/usr.sbin/nfsiod/Makefile  Sat Apr 15 21:23:02 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#      $NetBSD: Makefile,v 1.9 1995/03/18 14:59:03 cgd Exp $
-#      @(#)Makefile    8.1 (Berkeley) 6/5/93
-
-PROG=  nfsiod
-MAN=   nfsiod.8
-
-.include <bsd.prog.mk>
diff -r 81c005510af5 -r 63685efa5f82 usr.sbin/nfsiod/nfsiod.8
--- a/usr.sbin/nfsiod/nfsiod.8  Sat Apr 15 21:23:02 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-.\"    $NetBSD: nfsiod.8,v 1.8 1998/02/06 06:21:29 perry 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
-.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
-Specify how many servers are to be started.
-.El
-.Pp
-A client should run enough daemons to handle its maximum
-level of concurrency, typically four to six.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
-.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 -r 81c005510af5 -r 63685efa5f82 usr.sbin/nfsiod/nfsiod.c
--- a/usr.sbin/nfsiod/nfsiod.c  Sat Apr 15 21:23:02 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-/*     $NetBSD: nfsiod.c,v 1.15 1998/07/13 05:43:50 mrg 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__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
-__RCSID("$NetBSD: nfsiod.c,v 1.15 1998/07/13 05:43:50 mrg 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
-
-int    main __P((int, char **));
-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        MAXNFSDCNT      20
-#define        DEFNFSDCNT       1
-       num_servers = DEFNFSDCNT;
-       while ((ch = getopt(argc, argv, "n:")) != -1)
-               switch (ch) {
-               case 'n':
-                       num_servers = atoi(optarg);
-                       if (num_servers < 1 || num_servers > MAXNFSDCNT) {
-                               warnx("nfsiod count %d; reset to %d",
-                                   num_servers, DEFNFSDCNT);
-                               num_servers = DEFNFSDCNT;
-                       }
-                       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 > MAXNFSDCNT) {
-                       warnx("nfsiod count %d; reset to %d",
-                           num_servers, DEFNFSDCNT);
-                       num_servers = DEFNFSDCNT;
-               }
-       }
-
-       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;
-{
-
-       while (wait3(NULL, WNOHANG, NULL) > 0)
-               ;
-}
-
-void
-usage()
-{
-
-       (void)fprintf(stderr, "usage: nfsiod [-n num_servers]\n");
-       exit(1);
-}



Home | Main Index | Thread Index | Old Index