Date: Tue, 6 Apr 2004 15:35:45 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50529 for review Message-ID: <200404062235.i36MZjBN089831@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50529 Change 50529 by peter@peter_daintree on 2004/04/06 15:35:18 regen again Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#3 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#14 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#14 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#14 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#14 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#3 (text+ko) ==== @@ -75,9 +75,9 @@ int32_t ru_nivcsw; }; -#define FREEBSD32_MNAMELEN (88 - 2 * sizeof(int32_t)) /* size of on/from name bufs */ +#define FREEBSD4_FREEBSD32_MNAMELEN (88 - 2 * sizeof(int32_t)) /* size of on/from name bufs */ -struct statfs32 { +struct freebsd4_statfs32 { int32_t f_spare2; int32_t f_bsize; int32_t f_iosize; @@ -93,11 +93,11 @@ int32_t f_syncwrites; int32_t f_asyncwrites; char f_fstypename[MFSNAMELEN]; - char f_mntonname[FREEBSD32_MNAMELEN]; + char f_mntonname[FREEBSD4_FREEBSD32_MNAMELEN]; int32_t f_syncreads; int32_t f_asyncreads; int16_t f_spares1; - char f_mntfromname[FREEBSD32_MNAMELEN]; + char f_mntfromname[FREEBSD4_FREEBSD32_MNAMELEN]; int16_t f_spares2 __packed; int32_t f_spare[2]; }; ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#14 (text+ko) ==== @@ -197,23 +197,6 @@ 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 *)]; @@ -250,10 +233,6 @@ 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 *); ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#14 (text+ko) ==== @@ -286,10 +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_getfsstat 395 +#define FREEBSD32_SYS_statfs 396 +#define FREEBSD32_SYS_fstatfs 397 +#define FREEBSD32_SYS_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#14 (text+ko) ==== @@ -402,10 +402,10 @@ "uuidgen", /* 392 = uuidgen */ "freebsd32_sendfile", /* 393 = freebsd32_sendfile */ "#394", /* 394 = mac_syscall */ - "freebsd32_getfsstat", /* 395 = freebsd32_getfsstat */ - "freebsd32_statfs", /* 396 = freebsd32_statfs */ - "freebsd32_fstatfs", /* 397 = freebsd32_fstatfs */ - "freebsd32_fhstatfs", /* 398 = freebsd32_fhstatfs */ + "getfsstat", /* 395 = getfsstat */ + "statfs", /* 396 = statfs */ + "fstatfs", /* 397 = fstatfs */ + "fhstatfs", /* 398 = fhstatfs */ "#399", /* 399 = nosys */ "#400", /* 400 = ksem_close */ "#401", /* 401 = ksem_post */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#14 (text+ko) ==== @@ -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 */ - { 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 */ + { 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 */ { 0, (sy_call_t *)nosys }, /* 400 = ksem_close */ { 0, (sy_call_t *)nosys }, /* 401 = ksem_post */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404062235.i36MZjBN089831>