Update the five files derived from /sys/kern/syscalls.master

after the additions made for the new statfs structure (version
1.157). These must be updated in a separate checkin after
syscalls.master has been checked in so that they reflect its
new CVS identity. As these are purely derived files, it is not
clear to me why they are under CVS at all. I presume that it has
something to do with having `make world' operate properly.

5 files changed, 75 insertions, 50 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index fa05aaf..5302595 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.156 2003/11/07 20:23:23 jhb Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.157 2003/11/12 08:01:39 mckusick Exp 
  */
 
 #include "opt_compat.h"
@@ -46,7 +46,7 @@ struct sysent sysent[] = {
 	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
 	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
 	{ SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak },	/* 17 = break */
-	{ AS(getfsstat_args), (sy_call_t *)getfsstat },	/* 18 = getfsstat */
+	{ compat4(AS(freebsd4_getfsstat_args),getfsstat) },	/* 18 = old getfsstat */
 	{ compat(AS(olseek_args),lseek) },		/* 19 = old lseek */
 	{ SYF_MPSAFE | 0, (sy_call_t *)getpid },	/* 20 = getpid */
 	{ AS(mount_args), (sy_call_t *)mount },		/* 21 = mount */
@@ -185,8 +185,8 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 154 = nosys */
 	{ SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys },	/* 155 = nfssvc */
 	{ compat(AS(ogetdirentries_args),getdirentries) },	/* 156 = old getdirentries */
-	{ AS(statfs_args), (sy_call_t *)statfs },	/* 157 = statfs */
-	{ AS(fstatfs_args), (sy_call_t *)fstatfs },	/* 158 = fstatfs */
+	{ compat4(AS(freebsd4_statfs_args),statfs) },	/* 157 = old statfs */
+	{ compat4(AS(freebsd4_fstatfs_args),fstatfs) },	/* 158 = old fstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 159 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 160 = nosys */
 	{ AS(getfh_args), (sy_call_t *)getfh },		/* 161 = getfh */
@@ -325,7 +325,7 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 294 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 295 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 296 = nosys */
-	{ AS(fhstatfs_args), (sy_call_t *)fhstatfs },	/* 297 = fhstatfs */
+	{ compat4(AS(freebsd4_fhstatfs_args),fhstatfs) },	/* 297 = old fhstatfs */
 	{ AS(fhopen_args), (sy_call_t *)fhopen },	/* 298 = fhopen */
 	{ AS(fhstat_args), (sy_call_t *)fhstat },	/* 299 = fhstat */
 	{ SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext },	/* 300 = modnext */
@@ -423,10 +423,10 @@ struct sysent sysent[] = {
 	{ AS(uuidgen_args), (sy_call_t *)uuidgen },	/* 392 = uuidgen */
 	{ SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile },	/* 393 = sendfile */
 	{ SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall },	/* 394 = mac_syscall */
-	{ 0, (sy_call_t *)nosys },			/* 395 = nosys */
-	{ 0, (sy_call_t *)nosys },			/* 396 = nosys */
-	{ 0, (sy_call_t *)nosys },			/* 397 = nosys */
-	{ 0, (sy_call_t *)nosys },			/* 398 = nosys */
+	{ AS(getfsstat_args), (sy_call_t *)getfsstat },	/* 395 = getfsstat */
+	{ AS(statfs_args), (sy_call_t *)statfs },	/* 396 = statfs */
+	{ AS(fstatfs_args), (sy_call_t *)fstatfs },	/* 397 = fstatfs */
+	{ AS(fhstatfs_args), (sy_call_t *)fhstatfs },	/* 398 = fhstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 399 = nosys */
 	{ SYF_MPSAFE | AS(ksem_close_args), (sy_call_t *)lkmressys },	/* 400 = ksem_close */
 	{ SYF_MPSAFE | AS(ksem_post_args), (sy_call_t *)lkmressys },	/* 401 = ksem_post */
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 755a604..f8a1b35 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.156 2003/11/07 20:23:23 jhb Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.157 2003/11/12 08:01:39 mckusick Exp 
  */
 
 const char *syscallnames[] = {
@@ -25,7 +25,7 @@ const char *syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"getfsstat",			/* 18 = getfsstat */
+	"old.getfsstat",		/* 18 = old getfsstat */
 	"old.lseek",		/* 19 = old lseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -164,8 +164,8 @@ const char *syscallnames[] = {
 	"#154",			/* 154 = nosys */
 	"nfssvc",			/* 155 = nfssvc */
 	"old.getdirentries",		/* 156 = old getdirentries */
-	"statfs",			/* 157 = statfs */
-	"fstatfs",			/* 158 = fstatfs */
+	"old.statfs",		/* 157 = old statfs */
+	"old.fstatfs",		/* 158 = old fstatfs */
 	"#159",			/* 159 = nosys */
 	"#160",			/* 160 = nosys */
 	"getfh",			/* 161 = getfh */
@@ -304,7 +304,7 @@ const char *syscallnames[] = {
 	"#294",			/* 294 = nosys */
 	"#295",			/* 295 = nosys */
 	"#296",			/* 296 = nosys */
-	"fhstatfs",			/* 297 = fhstatfs */
+	"old.fhstatfs",		/* 297 = old fhstatfs */
 	"fhopen",			/* 298 = fhopen */
 	"fhstat",			/* 299 = fhstat */
 	"modnext",			/* 300 = modnext */
@@ -402,10 +402,10 @@ const char *syscallnames[] = {
 	"uuidgen",			/* 392 = uuidgen */
 	"sendfile",			/* 393 = sendfile */
 	"mac_syscall",			/* 394 = mac_syscall */
-	"#395",			/* 395 = nosys */
-	"#396",			/* 396 = nosys */
-	"#397",			/* 397 = nosys */
-	"#398",			/* 398 = nosys */
+	"getfsstat",			/* 395 = getfsstat */
+	"statfs",			/* 396 = statfs */
+	"fstatfs",			/* 397 = fstatfs */
+	"fhstatfs",			/* 398 = fhstatfs */
 	"#399",			/* 399 = nosys */
 	"ksem_close",			/* 400 = ksem_close */
 	"ksem_post",			/* 401 = ksem_post */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 8a44d6e..c5bb4d2 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.156 2003/11/07 20:23:23 jhb Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.157 2003/11/12 08:01:39 mckusick Exp 
  */
 
 #define	SYS_syscall	0
@@ -24,7 +24,7 @@
 #define	SYS_chmod	15
 #define	SYS_chown	16
 #define	SYS_break	17
-#define	SYS_getfsstat	18
+				/* 18 is old getfsstat */
 				/* 19 is old lseek */
 #define	SYS_getpid	20
 #define	SYS_mount	21
@@ -156,8 +156,8 @@
 				/* 150 is old getsockname */
 #define	SYS_nfssvc	155
 				/* 156 is old getdirentries */
-#define	SYS_statfs	157
-#define	SYS_fstatfs	158
+				/* 157 is old statfs */
+				/* 158 is old fstatfs */
 #define	SYS_getfh	161
 #define	SYS_getdomainname	162
 #define	SYS_setdomainname	163
@@ -221,7 +221,7 @@
 #define	SYS_nstat	278
 #define	SYS_nfstat	279
 #define	SYS_nlstat	280
-#define	SYS_fhstatfs	297
+				/* 297 is old fhstatfs */
 #define	SYS_fhopen	298
 #define	SYS_fhstat	299
 #define	SYS_modnext	300
@@ -310,6 +310,10 @@
 #define	SYS_uuidgen	392
 #define	SYS_sendfile	393
 #define	SYS_mac_syscall	394
+#define	SYS_getfsstat	395
+#define	SYS_statfs	396
+#define	SYS_fstatfs	397
+#define	SYS_fhstatfs	398
 #define	SYS_ksem_close	400
 #define	SYS_ksem_post	401
 #define	SYS_ksem_wait	402
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index af50e4f..2091fb2 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,7 +1,7 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
 # $FreeBSD$
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.156 2003/11/07 20:23:23 jhb Exp 
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.157 2003/11/12 08:01:39 mckusick Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \
@@ -19,7 +19,6 @@ MIASM =  \
 	chmod.o \
 	chown.o \
 	break.o \
-	getfsstat.o \
 	getpid.o \
 	mount.o \
 	unmount.o \
@@ -108,8 +107,6 @@ MIASM =  \
 	setsid.o \
 	quotactl.o \
 	nfssvc.o \
-	statfs.o \
-	fstatfs.o \
 	getfh.o \
 	getdomainname.o \
 	setdomainname.o \
@@ -173,7 +170,6 @@ MIASM =  \
 	nstat.o \
 	nfstat.o \
 	nlstat.o \
-	fhstatfs.o \
 	fhopen.o \
 	fhstat.o \
 	modnext.o \
@@ -256,6 +252,10 @@ MIASM =  \
 	uuidgen.o \
 	sendfile.o \
 	mac_syscall.o \
+	getfsstat.o \
+	statfs.o \
+	fstatfs.o \
+	fhstatfs.o \
 	ksem_close.o \
 	ksem_post.o \
 	ksem_wait.o \
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index c90e837..15018b9 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.156 2003/11/07 20:23:23 jhb Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.157 2003/11/12 08:01:39 mckusick Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -95,11 +95,6 @@ struct chown_args {
 struct obreak_args {
 	char nsize_l_[PADL_(char *)]; char * nsize; char nsize_r_[PADR_(char *)];
 };
-struct getfsstat_args {
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-	char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
 struct getpid_args {
 	register_t dummy;
 };
@@ -491,14 +486,6 @@ struct nfssvc_args {
 	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
 	char argp_l_[PADL_(caddr_t)]; caddr_t argp; char argp_r_[PADR_(caddr_t)];
 };
-struct statfs_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-};
-struct fstatfs_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-};
 struct getfh_args {
 	char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
 	char fhp_l_[PADL_(struct fhandle *)]; struct fhandle * fhp; char fhp_r_[PADR_(struct fhandle *)];
@@ -778,10 +765,6 @@ struct nlstat_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
 };
-struct fhstatfs_args {
-	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-};
 struct fhopen_args {
 	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
@@ -1128,6 +1111,23 @@ struct mac_syscall_args {
 	char call_l_[PADL_(int)]; int call; char call_r_[PADR_(int)];
 	char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)];
 };
+struct getfsstat_args {
+	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
+	char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
+	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+};
+struct statfs_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
+};
+struct fstatfs_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
+};
+struct fhstatfs_args {
+	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
+	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
+};
 struct ksem_close_args {
 	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
 };
@@ -1300,7 +1300,6 @@ int	mknod(struct thread *, struct mknod_args *);
 int	chmod(struct thread *, struct chmod_args *);
 int	chown(struct thread *, struct chown_args *);
 int	obreak(struct thread *, struct obreak_args *);
-int	getfsstat(struct thread *, struct getfsstat_args *);
 int	getpid(struct thread *, struct getpid_args *);
 int	mount(struct thread *, struct mount_args *);
 int	unmount(struct thread *, struct unmount_args *);
@@ -1389,8 +1388,6 @@ int	adjtime(struct thread *, struct adjtime_args *);
 int	setsid(struct thread *, struct setsid_args *);
 int	quotactl(struct thread *, struct quotactl_args *);
 int	nfssvc(struct thread *, struct nfssvc_args *);
-int	statfs(struct thread *, struct statfs_args *);
-int	fstatfs(struct thread *, struct fstatfs_args *);
 int	getfh(struct thread *, struct getfh_args *);
 int	getdomainname(struct thread *, struct getdomainname_args *);
 int	setdomainname(struct thread *, struct setdomainname_args *);
@@ -1452,7 +1449,6 @@ int	lutimes(struct thread *, struct lutimes_args *);
 int	nstat(struct thread *, struct nstat_args *);
 int	nfstat(struct thread *, struct nfstat_args *);
 int	nlstat(struct thread *, struct nlstat_args *);
-int	fhstatfs(struct thread *, struct fhstatfs_args *);
 int	fhopen(struct thread *, struct fhopen_args *);
 int	fhstat(struct thread *, struct fhstat_args *);
 int	modnext(struct thread *, struct modnext_args *);
@@ -1536,6 +1532,10 @@ int	lchflags(struct thread *, struct lchflags_args *);
 int	uuidgen(struct thread *, struct uuidgen_args *);
 int	sendfile(struct thread *, struct sendfile_args *);
 int	mac_syscall(struct thread *, struct mac_syscall_args *);
+int	getfsstat(struct thread *, struct getfsstat_args *);
+int	statfs(struct thread *, struct statfs_args *);
+int	fstatfs(struct thread *, struct fstatfs_args *);
+int	fhstatfs(struct thread *, struct fhstatfs_args *);
 int	ksem_close(struct thread *, struct ksem_close_args *);
 int	ksem_post(struct thread *, struct ksem_post_args *);
 int	ksem_wait(struct thread *, struct ksem_wait_args *);
@@ -1748,6 +1748,23 @@ int	ogetdirentries(struct thread *, struct ogetdirentries_args *);
 
 #ifdef COMPAT_FREEBSD4
 
+struct freebsd4_getfsstat_args {
+	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
+	char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
+	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+};
+struct freebsd4_statfs_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
+};
+struct freebsd4_fstatfs_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
+};
+struct freebsd4_fhstatfs_args {
+	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
+	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
+};
 struct freebsd4_sendfile_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
@@ -1765,6 +1782,10 @@ struct freebsd4_sigaction_args {
 struct freebsd4_sigreturn_args {
 	char sigcntxp_l_[PADL_(const struct ucontext4 *)]; const struct ucontext4 * sigcntxp; char sigcntxp_r_[PADR_(const struct ucontext4 *)];
 };
+int	freebsd4_getfsstat(struct thread *, struct freebsd4_getfsstat_args *);
+int	freebsd4_statfs(struct thread *, struct freebsd4_statfs_args *);
+int	freebsd4_fstatfs(struct thread *, struct freebsd4_fstatfs_args *);
+int	freebsd4_fhstatfs(struct thread *, struct freebsd4_fhstatfs_args *);
 int	freebsd4_sendfile(struct thread *, struct freebsd4_sendfile_args *);
 int	freebsd4_sigaction(struct thread *, struct freebsd4_sigaction_args *);
 int	freebsd4_sigreturn(struct thread *, struct freebsd4_sigreturn_args *);