From e4f937b07b0667bc69df4ee3b03238637bd40905 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 14 Nov 1995 05:16:37 +0000
Subject: [PATCH] Included <sys/sysproto.h> to get central declarations for
 syscall args structs and prototypes for syscalls.

Ifdefed duplicated decentralized declarations of args structs.  It's
convenient to have this visible but they are hard to maintain.  Some
are already different from the central declarations.  4.4lite2 puts
them in comments in the function headers but I wanted to avoid the
large changes for that.
---
 sys/nfs/nfs_syscalls.c       | 7 ++++++-
 sys/nfsclient/nfs_nfsiod.c   | 7 ++++++-
 sys/nfsserver/nfs_syscalls.c | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 786ce14e7ee..35590c384a0 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,11 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.7 1995/06/27 11:06:50 dfr Exp $
+ * $Id: nfs_syscalls.c,v 1.8 1995/10/29 15:33:11 phk Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -106,10 +107,12 @@ static int nfs_asyncdaemon[NFS_MAXASYNCDAEMON];
 /*
  * Get file handle system call
  */
+#ifndef _SYS_SYSPROTO_H_
 struct getfh_args {
 	char	*fname;
 	fhandle_t *fhp;
 };
+#endif
 int
 getfh(p, uap, retval)
 	struct proc *p;
@@ -149,10 +152,12 @@ getfh(p, uap, retval)
  * - remains in the kernel as an nfsd
  * - remains in the kernel as an nfsiod
  */
+#ifndef _SYS_SYSPROTO_H_
 struct nfssvc_args {
 	int flag;
 	caddr_t argp;
 };
+#endif
 int
 nfssvc(p, uap, retval)
 	struct proc *p;
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 786ce14e7ee..35590c384a0 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,11 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.7 1995/06/27 11:06:50 dfr Exp $
+ * $Id: nfs_syscalls.c,v 1.8 1995/10/29 15:33:11 phk Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -106,10 +107,12 @@ static int nfs_asyncdaemon[NFS_MAXASYNCDAEMON];
 /*
  * Get file handle system call
  */
+#ifndef _SYS_SYSPROTO_H_
 struct getfh_args {
 	char	*fname;
 	fhandle_t *fhp;
 };
+#endif
 int
 getfh(p, uap, retval)
 	struct proc *p;
@@ -149,10 +152,12 @@ getfh(p, uap, retval)
  * - remains in the kernel as an nfsd
  * - remains in the kernel as an nfsiod
  */
+#ifndef _SYS_SYSPROTO_H_
 struct nfssvc_args {
 	int flag;
 	caddr_t argp;
 };
+#endif
 int
 nfssvc(p, uap, retval)
 	struct proc *p;
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 786ce14e7ee..35590c384a0 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,11 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.7 1995/06/27 11:06:50 dfr Exp $
+ * $Id: nfs_syscalls.c,v 1.8 1995/10/29 15:33:11 phk Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -106,10 +107,12 @@ static int nfs_asyncdaemon[NFS_MAXASYNCDAEMON];
 /*
  * Get file handle system call
  */
+#ifndef _SYS_SYSPROTO_H_
 struct getfh_args {
 	char	*fname;
 	fhandle_t *fhp;
 };
+#endif
 int
 getfh(p, uap, retval)
 	struct proc *p;
@@ -149,10 +152,12 @@ getfh(p, uap, retval)
  * - remains in the kernel as an nfsd
  * - remains in the kernel as an nfsiod
  */
+#ifndef _SYS_SYSPROTO_H_
 struct nfssvc_args {
 	int flag;
 	caddr_t argp;
 };
+#endif
 int
 nfssvc(p, uap, retval)
 	struct proc *p;