Date: Tue, 6 Apr 2004 15:19:23 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50525 for review Message-ID: <200404062219.i36MJNNn085838@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50525 Change 50525 by peter@peter_daintree on 2004/04/06 15:18:24 start trying to catch up with statfs changes Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#13 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#13 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#13 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#13 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#15 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.24 2004/04/05 10:17:23 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.36 2004/03/27 14:30:42 mtm Exp */ @@ -38,11 +38,6 @@ char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; char rusage_l_[PADL_(struct rusage32 *)]; struct rusage32 * rusage; char rusage_r_[PADR_(struct rusage32 *)]; }; -struct freebsd32_getfsstat_args { - char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; - 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 freebsd32_sigaltstack_args { char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; @@ -98,14 +93,6 @@ char delta_l_[PADL_(struct timeval32 *)]; struct timeval32 * delta; char delta_r_[PADR_(struct timeval32 *)]; char olddelta_l_[PADL_(struct timeval32 *)]; struct timeval32 * olddelta; char olddelta_r_[PADR_(struct timeval32 *)]; }; -struct freebsd32_statfs_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; -}; -struct freebsd32_fstatfs_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; -}; struct freebsd32_semsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; @@ -210,6 +197,23 @@ char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct freebsd32_getfsstat_args { + char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; + 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 freebsd32_statfs_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; +}; +struct freebsd32_fstatfs_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; +}; +struct freebsd32_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 statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; +}; struct freebsd32_sigaction_args { char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)]; @@ -219,7 +223,6 @@ char sigcntxp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd32_ucontext *)]; }; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); -int freebsd32_getfsstat(struct thread *, struct freebsd32_getfsstat_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); @@ -232,8 +235,6 @@ int freebsd32_settimeofday(struct thread *, struct freebsd32_settimeofday_args *); int freebsd32_utimes(struct thread *, struct freebsd32_utimes_args *); int freebsd32_adjtime(struct thread *, struct freebsd32_adjtime_args *); -int freebsd32_statfs(struct thread *, struct freebsd32_statfs_args *); -int freebsd32_fstatfs(struct thread *, struct freebsd32_fstatfs_args *); int freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *); int freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *); int freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *); @@ -249,6 +250,10 @@ int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); +int freebsd32_getfsstat(struct thread *, struct freebsd32_getfsstat_args *); +int freebsd32_statfs(struct thread *, struct freebsd32_statfs_args *); +int freebsd32_fstatfs(struct thread *, struct freebsd32_fstatfs_args *); +int freebsd32_fhstatfs(struct thread *, struct freebsd32_fhstatfs_args *); int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *); int freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *); @@ -260,6 +265,23 @@ #ifdef COMPAT_FREEBSD4 +struct freebsd4_freebsd32_getfsstat_args { + char buf_l_[PADL_(struct freebsd4_statfs32 *)]; struct freebsd4_statfs32 * buf; char buf_r_[PADR_(struct freebsd4_statfs32 *)]; + 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_freebsd32_statfs_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct freebsd4_statfs32 *)]; struct freebsd4_statfs32 * buf; char buf_r_[PADR_(struct freebsd4_statfs32 *)]; +}; +struct freebsd4_freebsd32_fstatfs_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(struct freebsd4_statfs32 *)]; struct freebsd4_statfs32 * buf; char buf_r_[PADR_(struct freebsd4_statfs32 *)]; +}; +struct freebsd4_freebsd32_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 freebsd4_statfs *)]; struct freebsd4_statfs * buf; char buf_r_[PADR_(struct freebsd4_statfs *)]; +}; struct freebsd4_freebsd32_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)]; @@ -278,6 +300,10 @@ struct freebsd4_freebsd32_sigreturn_args { char sigcntxp_l_[PADL_(const struct freebsd4_freebsd32_ucontext *)]; const struct freebsd4_freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd4_freebsd32_ucontext *)]; }; +int freebsd4_freebsd32_getfsstat(struct thread *, struct freebsd4_freebsd32_getfsstat_args *); +int freebsd4_freebsd32_statfs(struct thread *, struct freebsd4_freebsd32_statfs_args *); +int freebsd4_freebsd32_fstatfs(struct thread *, struct freebsd4_freebsd32_fstatfs_args *); +int freebsd4_freebsd32_fhstatfs(struct thread *, struct freebsd4_freebsd32_fhstatfs_args *); int freebsd4_freebsd32_sendfile(struct thread *, struct freebsd4_freebsd32_sendfile_args *); int freebsd4_freebsd32_sigaction(struct thread *, struct freebsd4_freebsd32_sigaction_args *); int freebsd4_freebsd32_sigreturn(struct thread *, struct freebsd4_freebsd32_sigreturn_args *); ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.24 2004/04/05 10:17:23 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.36 2004/03/27 14:30:42 mtm Exp */ @@ -24,7 +24,7 @@ #define FREEBSD32_SYS_chmod 15 #define FREEBSD32_SYS_chown 16 #define FREEBSD32_SYS_break 17 -#define FREEBSD32_SYS_freebsd32_getfsstat 18 + /* 18 is old freebsd32_getfsstat */ /* 19 is obsolete olseek */ #define FREEBSD32_SYS_getpid 20 #define FREEBSD32_SYS_mount 21 @@ -150,8 +150,8 @@ /* 149 is obsolete oquota */ /* 150 is obsolete ogetsockname */ /* 156 is obsolete ogetdirentries */ -#define FREEBSD32_SYS_freebsd32_statfs 157 -#define FREEBSD32_SYS_freebsd32_fstatfs 158 + /* 157 is old freebsd32_statfs */ + /* 158 is old freebsd32_fstatfs */ #define FREEBSD32_SYS_getfh 161 #define FREEBSD32_SYS_getdomainname 162 #define FREEBSD32_SYS_setdomainname 163 @@ -215,7 +215,7 @@ #define FREEBSD32_SYS_nstat 278 #define FREEBSD32_SYS_nfstat 279 #define FREEBSD32_SYS_nlstat 280 -#define FREEBSD32_SYS_fhstatfs 297 + /* 297 is old freebsd32_fhstatfs */ #define FREEBSD32_SYS_fhopen 298 #define FREEBSD32_SYS_fhstat 299 #define FREEBSD32_SYS_modnext 300 @@ -286,6 +286,10 @@ #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 #define FREEBSD32_SYS_freebsd32_sendfile 393 +#define FREEBSD32_SYS_freebsd32_getfsstat 395 +#define FREEBSD32_SYS_freebsd32_statfs 396 +#define FREEBSD32_SYS_freebsd32_fstatfs 397 +#define FREEBSD32_SYS_freebsd32_fhstatfs 398 #define FREEBSD32_SYS_freebsd32_sigaction 416 #define FREEBSD32_SYS_freebsd32_sigreturn 417 #define FREEBSD32_SYS_thr_create 430 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.15 2004/04/05 10:17:23 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.36 2004/03/27 14:30:42 mtm Exp */ @@ -25,7 +25,7 @@ "chmod", /* 15 = chmod */ "chown", /* 16 = chown */ "break", /* 17 = break */ - "freebsd32_getfsstat", /* 18 = freebsd32_getfsstat */ + "old.freebsd32_getfsstat", /* 18 = old freebsd32_getfsstat */ "obs_olseek", /* 19 = obsolete olseek */ "getpid", /* 20 = getpid */ "mount", /* 21 = mount */ @@ -164,8 +164,8 @@ "#154", /* 154 = nosys */ "#155", /* 155 = nfssvc */ "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ - "freebsd32_statfs", /* 157 = freebsd32_statfs */ - "freebsd32_fstatfs", /* 158 = freebsd32_fstatfs */ + "old.freebsd32_statfs", /* 157 = old freebsd32_statfs */ + "old.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */ "#159", /* 159 = nosys */ "#160", /* 160 = nosys */ "getfh", /* 161 = getfh */ @@ -304,7 +304,7 @@ "#294", /* 294 = nosys */ "#295", /* 295 = nosys */ "#296", /* 296 = nosys */ - "fhstatfs", /* 297 = fhstatfs */ + "old.freebsd32_fhstatfs", /* 297 = old freebsd32_fhstatfs */ "fhopen", /* 298 = fhopen */ "fhstat", /* 299 = fhstat */ "modnext", /* 300 = modnext */ @@ -402,10 +402,10 @@ "uuidgen", /* 392 = uuidgen */ "freebsd32_sendfile", /* 393 = freebsd32_sendfile */ "#394", /* 394 = mac_syscall */ - "#395", /* 395 = nosys */ - "#396", /* 396 = nosys */ - "#397", /* 397 = nosys */ - "#398", /* 398 = nosys */ + "freebsd32_getfsstat", /* 395 = freebsd32_getfsstat */ + "freebsd32_statfs", /* 396 = freebsd32_statfs */ + "freebsd32_fstatfs", /* 397 = freebsd32_fstatfs */ + "freebsd32_fhstatfs", /* 398 = freebsd32_fhstatfs */ "#399", /* 399 = nosys */ "#400", /* 400 = ksem_close */ "#401", /* 401 = ksem_post */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.25 2004/04/05 10:17:23 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.36 2004/03/27 14:30:42 mtm Exp */ @@ -43,7 +43,7 @@ { 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(freebsd32_getfsstat_args), (sy_call_t *)freebsd32_getfsstat }, /* 18 = freebsd32_getfsstat */ + { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat) }, /* 18 = old freebsd32_getfsstat */ { 0, (sy_call_t *)nosys }, /* 19 = obsolete olseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid }, /* 20 = getpid */ { AS(mount_args), (sy_call_t *)mount }, /* 21 = mount */ @@ -182,8 +182,8 @@ { 0, (sy_call_t *)nosys }, /* 154 = nosys */ { 0, (sy_call_t *)nosys }, /* 155 = nfssvc */ { 0, (sy_call_t *)nosys }, /* 156 = obsolete ogetdirentries */ - { AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 157 = freebsd32_statfs */ - { AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 158 = freebsd32_fstatfs */ + { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs) }, /* 157 = old freebsd32_statfs */ + { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs) }, /* 158 = old freebsd32_fstatfs */ { 0, (sy_call_t *)nosys }, /* 159 = nosys */ { 0, (sy_call_t *)nosys }, /* 160 = nosys */ { AS(getfh_args), (sy_call_t *)getfh }, /* 161 = getfh */ @@ -322,7 +322,7 @@ { 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_freebsd32_fhstatfs_args),freebsd32_fhstatfs) }, /* 297 = old freebsd32_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 */ @@ -420,10 +420,10 @@ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile }, /* 393 = freebsd32_sendfile */ { 0, (sy_call_t *)nosys }, /* 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(freebsd32_getfsstat_args), (sy_call_t *)freebsd32_getfsstat }, /* 395 = freebsd32_getfsstat */ + { AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 396 = freebsd32_statfs */ + { AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 397 = freebsd32_fstatfs */ + { AS(freebsd32_fhstatfs_args), (sy_call_t *)freebsd32_fhstatfs }, /* 398 = freebsd32_fhstatfs */ { 0, (sy_call_t *)nosys }, /* 399 = nosys */ { 0, (sy_call_t *)nosys }, /* 400 = ksem_close */ { 0, (sy_call_t *)nosys }, /* 401 = ksem_post */ ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#15 (text+ko) ==== @@ -64,8 +64,8 @@ 15 NOPROTO { int chmod(char *path, int mode); } 16 NOPROTO { int chown(char *path, int uid, int gid); } 17 MNOPROTO { int obreak(char *nsize); } break obreak_args int -18 STD { int freebsd32_getfsstat(struct statfs32 *buf, long bufsize, \ - int flags); } +18 COMPAT4 { int freebsd32_getfsstat(struct freebsd4_statfs32 *buf, \ + long bufsize, int flags); } 19 OBSOL olseek 20 MNOPROTO { pid_t getpid(void); } 21 NOPROTO { int mount(char *type, char *path, int flags, \ @@ -232,8 +232,9 @@ ; XXX this is a problem!!! 155 UNIMPL nfssvc 156 OBSOL ogetdirentries -157 STD { int freebsd32_statfs(char *path, struct statfs32 *buf); } -158 STD { int freebsd32_fstatfs(int fd, struct statfs32 *buf); } +157 COMPAT4 { int freebsd32_statfs(char *path, \ + struct freebsd4_statfs32 *buf); } +158 COMPAT4 { int freebsd32_fstatfs(int fd, struct freebsd4_statfs32 *buf);} 159 UNIMPL nosys 160 UNIMPL nosys 161 NOPROTO { int getfh(char *fname, struct fhandle *fhp); } @@ -414,8 +415,8 @@ 295 UNIMPL nosys 296 UNIMPL nosys ; XXX 297 is 300 in NetBSD -297 NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \ - struct statfs *buf); } +297 COMPAT4 { int freebsd32_fhstatfs(const struct fhandle *u_fhp, \ + struct freebsd4_statfs *buf); } 298 NOPROTO { int fhopen(const struct fhandle *u_fhp, int flags); } 299 NOPROTO { int fhstat(const struct fhandle *u_fhp, struct stat *sb); } ; syscall numbers for FreeBSD @@ -550,10 +551,12 @@ u_int32_t offsethi, size_t nbytes, struct sf_hdtr *hdtr, \ off_t *sbytes, int flags); } 394 UNIMPL mac_syscall -395 UNIMPL nosys -396 UNIMPL nosys -397 UNIMPL nosys -398 UNIMPL nosys +395 STD { int freebsd32_getfsstat(struct statfs32 *buf, long bufsize, \ + int flags); } +396 STD { int freebsd32_statfs(char *path, struct statfs32 *buf); } +397 STD { int freebsd32_fstatfs(int fd, struct statfs32 *buf); } +398 STD { int freebsd32_fhstatfs(const struct fhandle *u_fhp, \ + struct statfs32 *buf); } 399 UNIMPL nosys ; XXX implement these? 400 UNIMPL ksem_close
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404062219.i36MJNNn085838>