From eb5102e998d09466c5169eabe96d3e1ed1919d17 Mon Sep 17 00:00:00 2001 From: "Chas Williams (CONTRACTOR)" Date: Thu, 31 Jul 2014 11:45:14 -0400 Subject: [PATCH] config: Refactor the FreeBSD configuration files Use a common file for most of the platform specific settings. Change-Id: If95ad44de99fc3320570d53d706fed4d760fe67d Reviewed-on: http://gerrit.openafs.org/11346 Tested-by: BuildBot Reviewed-by: Garrett Wollman Reviewed-by: D Brashear --- acinclude.m4 | 1 + src/config/param.amd64_fbsd_100.h | 198 ++++++---------------------- src/config/param.amd64_fbsd_101.h | 200 ++++++---------------------- src/config/param.amd64_fbsd_110.h | 200 ++++++---------------------- src/config/param.amd64_fbsd_53.h | 163 ++--------------------- src/config/param.amd64_fbsd_70.h | 165 ++--------------------- src/config/param.amd64_fbsd_71.h | 167 ++---------------------- src/config/param.amd64_fbsd_72.h | 169 ++---------------------- src/config/param.amd64_fbsd_73.h | 171 ++---------------------- src/config/param.amd64_fbsd_74.h | 173 ++----------------------- src/config/param.amd64_fbsd_80.h | 175 +++---------------------- src/config/param.amd64_fbsd_81.h | 177 +++---------------------- src/config/param.amd64_fbsd_82.h | 179 +++---------------------- src/config/param.amd64_fbsd_83.h | 181 +++----------------------- src/config/param.amd64_fbsd_84.h | 183 ++++---------------------- src/config/param.amd64_fbsd_90.h | 188 +++++---------------------- src/config/param.amd64_fbsd_91.h | 190 +++++---------------------- src/config/param.amd64_fbsd_92.h | 192 +++++---------------------- src/config/param.amd64_fbsd_93.h | 194 +++++---------------------- src/config/param.generic_fbsd.h | 161 +++++++++++++++++++++++ src/config/param.i386_fbsd_100.h | 204 ++++++----------------------- src/config/param.i386_fbsd_101.h | 206 +++++++---------------------- src/config/param.i386_fbsd_110.h | 209 +++++++----------------------- src/config/param.i386_fbsd_50.h | 171 +----------------------- src/config/param.i386_fbsd_51.h | 176 ++----------------------- src/config/param.i386_fbsd_52.h | 179 ++----------------------- src/config/param.i386_fbsd_53.h | 172 ++---------------------- src/config/param.i386_fbsd_60.h | 175 ++----------------------- src/config/param.i386_fbsd_61.h | 164 ++--------------------- src/config/param.i386_fbsd_62.h | 166 ++---------------------- src/config/param.i386_fbsd_70.h | 169 +++--------------------- src/config/param.i386_fbsd_71.h | 172 +++--------------------- src/config/param.i386_fbsd_72.h | 174 +++---------------------- src/config/param.i386_fbsd_73.h | 176 +++---------------------- src/config/param.i386_fbsd_74.h | 179 +++---------------------- src/config/param.i386_fbsd_80.h | 181 ++++---------------------- src/config/param.i386_fbsd_81.h | 183 ++++---------------------- src/config/param.i386_fbsd_82.h | 185 ++++---------------------- src/config/param.i386_fbsd_83.h | 187 ++++---------------------- src/config/param.i386_fbsd_84.h | 189 ++++----------------------- src/config/param.i386_fbsd_90.h | 194 +++++---------------------- src/config/param.i386_fbsd_91.h | 196 +++++----------------------- src/config/param.i386_fbsd_92.h | 198 ++++++---------------------- src/config/param.i386_fbsd_93.h | 204 ++++++----------------------- 44 files changed, 1142 insertions(+), 6694 deletions(-) create mode 100644 src/config/param.generic_fbsd.h diff --git a/acinclude.m4 b/acinclude.m4 index 4052f99c1..7c277acba 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -818,6 +818,7 @@ case $AFS_SYSNAME in *_linux_22) AFS_PARAM_COMMON=param.linux22.h ;; *_linux_24) AFS_PARAM_COMMON=param.linux24.h ;; *_linux_26) AFS_PARAM_COMMON=param.linux26.h ;; + *_fbsd_*) AFS_PARAM_COMMON=param.generic_fbsd.h ;; esac OPENAFS_OSCONF diff --git a/src/config/param.amd64_fbsd_100.h b/src/config/param.amd64_fbsd_100.h index 891fbb1bc..7a8a26559 100644 --- a/src/config/param.amd64_fbsd_100.h +++ b/src/config/param.amd64_fbsd_100.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_100" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_100 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,170 +21,61 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 +#define AFS_FBSD92_ENV 1 +#define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 +#define AFS_X86_FBSD92_ENV 1 +#define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD100_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 +#define AFS_USR_FBSD100_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_101.h b/src/config/param.amd64_fbsd_101.h index fce558979..d092cd98f 100644 --- a/src/config/param.amd64_fbsd_101.h +++ b/src/config/param.amd64_fbsd_101.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_101" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_101 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,173 +21,64 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 +#define AFS_FBSD92_ENV 1 +#define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 +#define AFS_X86_FBSD92_ENV 1 +#define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD100_ENV 1 -#define AFS_USR_FBSD101_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 +#define AFS_USR_FBSD100_ENV 1 +#define AFS_USR_FBSD101_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_110.h b/src/config/param.amd64_fbsd_110.h index f14680dce..2e896a843 100644 --- a/src/config/param.amd64_fbsd_110.h +++ b/src/config/param.amd64_fbsd_110.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_110" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_110 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,173 +21,64 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 +#define AFS_FBSD92_ENV 1 +#define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 #define AFS_FBSD110_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 +#define AFS_X86_FBSD92_ENV 1 +#define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD110_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD100_ENV 1 -#define AFS_USR_FBSD110_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 +#define AFS_USR_FBSD100_ENV 1 +#define AFS_USR_FBSD110_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_53.h b/src/config/param.amd64_fbsd_53.h index a3c7429da..310f8a5a2 100644 --- a/src/config/param.amd64_fbsd_53.h +++ b/src/config/param.amd64_fbsd_53.h @@ -1,181 +1,38 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H +#define AFS_64BITPOINTER_ENV 1 + #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 #define AFS_FBSD53_ENV 1 -#define AFS_X86_FBSD_ENV 1 #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VM_RDWR_ENV 1 -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif #define SYS_NAME "amd64_fbsd_53" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_53 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -#define AFSLITTLE_ENDIAN 1 - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ - #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 /* Machine / Operating system information */ -#include #define SYS_NAME "i386_fbsd_53" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_53 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - #endif /* !defined(UKERNEL) */ #endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_70.h b/src/config/param.amd64_fbsd_70.h index b5b82d97d..0ed9df4e4 100644 --- a/src/config/param.amd64_fbsd_70.h +++ b/src/config/param.amd64_fbsd_70.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_70" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_70 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,153 +20,23 @@ #define AFS_FBSD61_ENV 1 #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_71.h b/src/config/param.amd64_fbsd_71.h index 4ffcddad8..255c3f8cd 100644 --- a/src/config/param.amd64_fbsd_71.h +++ b/src/config/param.amd64_fbsd_71.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_71" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_71 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,155 +21,25 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_72.h b/src/config/param.amd64_fbsd_72.h index 4cbab9ecf..a38d01d5b 100644 --- a/src/config/param.amd64_fbsd_72.h +++ b/src/config/param.amd64_fbsd_72.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_72" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_72 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -37,157 +22,25 @@ #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 #define AFS_FBSD72_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 -#define AFS_X86_FBSD71_ENV 1 #define AFS_X86_FBSD72_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD72_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD72_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_73.h b/src/config/param.amd64_fbsd_73.h index b55a534d2..304b4b4f5 100644 --- a/src/config/param.amd64_fbsd_73.h +++ b/src/config/param.amd64_fbsd_73.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_73" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_73 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -38,7 +23,7 @@ #define AFS_FBSD71_ENV 1 #define AFS_FBSD72_ENV 1 #define AFS_FBSD73_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 @@ -46,151 +31,21 @@ #define AFS_X86_FBSD71_ENV 1 #define AFS_X86_FBSD72_ENV 1 #define AFS_X86_FBSD73_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD72_ENV 1 -#define AFS_USR_FBSD73_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_74.h b/src/config/param.amd64_fbsd_74.h index ad3d1e74a..18b16d867 100644 --- a/src/config/param.amd64_fbsd_74.h +++ b/src/config/param.amd64_fbsd_74.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_74" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_74 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -39,7 +24,7 @@ #define AFS_FBSD72_ENV 1 #define AFS_FBSD73_ENV 1 #define AFS_FBSD74_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 @@ -48,152 +33,22 @@ #define AFS_X86_FBSD72_ENV 1 #define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD74_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD72_ENV 1 -#define AFS_USR_FBSD73_ENV 1 -#define AFS_USR_FBSD74_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD74_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_80.h b/src/config/param.amd64_fbsd_80.h index bb8f2d1aa..29b03462c 100644 --- a/src/config/param.amd64_fbsd_80.h +++ b/src/config/param.amd64_fbsd_80.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_80" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_80 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,158 +21,34 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_81.h b/src/config/param.amd64_fbsd_81.h index 4e159c0a8..006e06436 100644 --- a/src/config/param.amd64_fbsd_81.h +++ b/src/config/param.amd64_fbsd_81.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_81" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_81 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,161 +21,37 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_82.h b/src/config/param.amd64_fbsd_82.h index 23572fcb4..c8d95917c 100644 --- a/src/config/param.amd64_fbsd_82.h +++ b/src/config/param.amd64_fbsd_82.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_82" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_82 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,164 +21,40 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_FBSD82_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_83.h b/src/config/param.amd64_fbsd_83.h index 6eaaf393e..d27d314d2 100644 --- a/src/config/param.amd64_fbsd_83.h +++ b/src/config/param.amd64_fbsd_83.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_83" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_83 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,167 +21,43 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_FBSD82_ENV 1 #define AFS_FBSD83_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD82_ENV 1 #define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_84.h b/src/config/param.amd64_fbsd_84.h index 2bed47ea3..903c83bb4 100644 --- a/src/config/param.amd64_fbsd_84.h +++ b/src/config/param.amd64_fbsd_84.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_84" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_84 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,170 +21,46 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_FBSD82_ENV 1 #define AFS_FBSD83_ENV 1 #define AFS_FBSD84_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD82_ENV 1 #define AFS_X86_FBSD83_ENV 1 #define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_90.h b/src/config/param.amd64_fbsd_90.h index 054b8dbc7..e56c2d097 100644 --- a/src/config/param.amd64_fbsd_90.h +++ b/src/config/param.amd64_fbsd_90.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_90" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_90 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,164 +21,49 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_91.h b/src/config/param.amd64_fbsd_91.h index 20669263c..3ef236a97 100644 --- a/src/config/param.amd64_fbsd_91.h +++ b/src/config/param.amd64_fbsd_91.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_91" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_91 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,167 +21,52 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_92.h b/src/config/param.amd64_fbsd_92.h index b6c41d0d4..95c6e19c6 100644 --- a/src/config/param.amd64_fbsd_92.h +++ b/src/config/param.amd64_fbsd_92.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_92" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_92 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,170 +21,55 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 #define AFS_FBSD92_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 #define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_93.h b/src/config/param.amd64_fbsd_93.h index d02e11571..1a798c8f8 100644 --- a/src/config/param.amd64_fbsd_93.h +++ b/src/config/param.amd64_fbsd_93.h @@ -5,28 +5,13 @@ #define SYS_NAME "amd64_fbsd_93" #define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_93 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - +#define AFS_64BITPOINTER_ENV 1 #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif +#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,173 +21,58 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 #define AFS_FBSD92_ENV 1 #define AFS_FBSD93_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 #define AFS_X86_FBSD92_ENV 1 #define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BITPOINTER_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.generic_fbsd.h b/src/config/param.generic_fbsd.h new file mode 100644 index 000000000..627d25efa --- /dev/null +++ b/src/config/param.generic_fbsd.h @@ -0,0 +1,161 @@ +#ifndef AFS_PARAM_COMMON_H +#define AFS_PARAM_COMMON_H + +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ + +#ifndef IGNORE_STDS_H +#include +#endif + +#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ +#define AFS_X86_XBSD_ENV 1 + +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_CLIENT 1 +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#define AFS_FBSD_ENV 1 +#define AFS_X86_FBSD_ENV 1 +#define AFS_X86_ENV 1 +#undef AFS_NONFSTRANS +#define AFS_NONFSTRANS 1 +#define FTRUNC O_TRUNC + +#define IUPD 0x0010 +#define IACC 0x0020 +#define ICHG 0x0040 +#define IMOD 0x0080 + +#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ + NULL, curproc) +#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ + NULL, curproc) + +#include + +#define AFS_VFS_ENV 1 +#define AFS_VFSINCL_ENV 1 +#define AFS_GREEDY43_ENV 1 +#define AFS_ENV 1 + +#define AFS_SYSCALL 339 +#define AFS_MOUNT_AFS "afs" + +#ifndef MOUNT_UFS +#define MOUNT_UFS "ufs" +#endif + +#ifndef MOUNT_AFS +#define MOUNT_AFS AFS_MOUNT_AFS +#endif + +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + +/* Extra kernel definitions (from kdefs file) */ +#ifdef _KERNEL +#define AFS_GLOBAL_SUNLOCK 1 +#define AFS_VFS34 1 /* What is VFS34??? */ +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_resid uio_resid +#define AFS_UIOSYS UIO_SYSSPACE +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES CLBYTES +#define osi_GetTime(x) microtime(x) +#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) +#undef AFS_KALLOC_NOSLEEP +#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) +#define AFS_KFREE(x,y) osi_fbsd_free((x)) +#define v_count v_usecount +#define v_vfsp v_mount +#define vfs_bsize mnt_stat.f_bsize +#define vfs_fsid mnt_stat.f_fsid +#define va_nodeid va_fileid +#define vfs_vnodecovered mnt_vnodecovered +#define direct dirent +#define vnode_t struct vnode + +#ifndef MUTEX_DEFAULT +#define MUTEX_DEFAULT 0 +#endif /* MUTEX_DEFAULT */ + +#ifndef SSYS +#define SSYS 0x00002 +#endif /* SSYS */ + +#define p_rcred p_ucred + +# if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) +enum vcexcl { NONEXCL, EXCL }; + +# ifdef KERNEL +# ifndef MIN +# define MIN(A,B) ((A) < (B) ? (A) : (B)) +# endif +# ifndef MAX +# define MAX(A,B) ((A) > (B) ? (A) : (B)) +# endif +# endif /* KERNEL */ + +# endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ +#endif /* _KERNEL */ + +#else /* !defined(UKERNEL) */ + +/* This section for user space compiles only */ + +#define UKERNEL 1 /* user space kernel */ +#define AFS_ENV 1 +#define AFS_VFSINCL_ENV 1 +#define AFS_USR_FBSD_ENV 1 +#undef AFS_NONFSTRANS +#define AFS_NONFSTRANS 1 + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 339 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +#define AFS_HAVE_STATVFS 1 /* System supports statvfs */ + +#include + +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_fmode uio_fmode +#define afsio_resid uio_resid +#define AFS_UIOSYS 1 +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES MCLBYTES +#define AFS_MINCHANGE 2 +#define VATTR_NULL usr_vattr_null + +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* !defined(UKERNEL) */ + +#endif /* AFS_COMMON_PARAM_H */ diff --git a/src/config/param.i386_fbsd_100.h b/src/config/param.i386_fbsd_100.h index eaabbdd88..0e898c4ce 100644 --- a/src/config/param.i386_fbsd_100.h +++ b/src/config/param.i386_fbsd_100.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_100" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_100 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,169 +19,67 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 +#define AFS_FBSD92_ENV 1 +#define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 +#define AFS_X86_FBSD92_ENV 1 +#define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD100_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 +#define AFS_USR_FBSD100_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_101.h b/src/config/param.i386_fbsd_101.h index 25f5c733e..6224bf2ad 100644 --- a/src/config/param.i386_fbsd_101.h +++ b/src/config/param.i386_fbsd_101.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_101" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_101 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,172 +19,70 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 +#define AFS_FBSD92_ENV 1 +#define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 +#define AFS_X86_FBSD92_ENV 1 +#define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD100_ENV 1 -#define AFS_USR_FBSD101_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 +#define AFS_USR_FBSD100_ENV 1 +#define AFS_USR_FBSD101_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_110.h b/src/config/param.i386_fbsd_110.h index b9e11c6f0..066c842b0 100644 --- a/src/config/param.i386_fbsd_110.h +++ b/src/config/param.i386_fbsd_110.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_110" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_110 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,172 +19,73 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 +#define AFS_FBSD92_ENV 1 +#define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 +#define AFS_FBSD101_ENV 1 #define AFS_FBSD110_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 +#define AFS_X86_FBSD92_ENV 1 +#define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 +#define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD110_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD100_ENV 1 -#define AFS_USR_FBSD110_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 +#define AFS_USR_FBSD100_ENV 1 +#define AFS_USR_FBSD101_ENV 1 +#define AFS_USR_FBSD110_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_50.h b/src/config/param.i386_fbsd_50.h index df86a4741..fb756e1a9 100644 --- a/src/config/param.i386_fbsd_50.h +++ b/src/config/param.i386_fbsd_50.h @@ -1,180 +1,23 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - #ifndef AFS_PARAM_H #define AFS_PARAM_H -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD50_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VM_RDWR_ENV 1 -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif +/* Machine / Operating system information */ #define SYS_NAME "i386_fbsd_50" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_50 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -#define AFSLITTLE_ENDIAN 1 - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ +#define AFS_FBSD50_ENV 1 -#endif /* AFS_PARAM_H */ +#define AFS_X86_FBSD50_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - - -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#include +#define AFS_USR_FBSD50_ENV 1 -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_50" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_50 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#endif /* !defined(UKERNEL) */ #endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_51.h b/src/config/param.i386_fbsd_51.h index fccf77af9..65e9b47bc 100644 --- a/src/config/param.i386_fbsd_51.h +++ b/src/config/param.i386_fbsd_51.h @@ -1,182 +1,26 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - #ifndef AFS_PARAM_H #define AFS_PARAM_H -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD50_ENV 1 -#define AFS_FBSD51_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VM_RDWR_ENV 1 -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif +/* Machine / Operating system information */ #define SYS_NAME "i386_fbsd_51" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_51 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -#define AFSLITTLE_ENDIAN 1 - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ +#define AFS_FBSD50_ENV 1 +#define AFS_FBSD51_ENV 1 -#endif /* AFS_PARAM_H */ +#define AFS_X86_FBSD50_ENV 1 +#define AFS_X86_FBSD51_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - - -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_51" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_51 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#endif /* !defined(UKERNEL) */ #endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_52.h b/src/config/param.i386_fbsd_52.h index bb831a8e9..8c2caa20b 100644 --- a/src/config/param.i386_fbsd_52.h +++ b/src/config/param.i386_fbsd_52.h @@ -1,184 +1,29 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - #ifndef AFS_PARAM_H #define AFS_PARAM_H -#ifndef IGNORE_STDS_H -#include -#endif +/* Machine / Operating system information */ +#define SYS_NAME "i386_fbsd_52" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_52 -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VM_RDWR_ENV 1 -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif -#define SYS_NAME "i386_fbsd_52" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_52 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -#define AFSLITTLE_ENDIAN 1 - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ - -#endif /* AFS_PARAM_H */ +#define AFS_X86_FBSD50_ENV 1 +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - - -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_52" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_52 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#endif /* !defined(UKERNEL) */ #endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_53.h b/src/config/param.i386_fbsd_53.h index d4c5178be..eda7899d2 100644 --- a/src/config/param.i386_fbsd_53.h +++ b/src/config/param.i386_fbsd_53.h @@ -1,179 +1,31 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H +/* Machine / Operating system information */ +#define SYS_NAME "i386_fbsd_53" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_53 + #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 #define AFS_FBSD53_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VM_RDWR_ENV 1 -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif -#define SYS_NAME "i386_fbsd_53" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_53 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ -#define AFSLITTLE_ENDIAN 1 - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ +#define AFS_X86_FBSD50_ENV 1 +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#include -#define SYS_NAME "i386_fbsd_53" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_53 - -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_60.h b/src/config/param.i386_fbsd_60.h index cc5384159..f059f4d17 100644 --- a/src/config/param.i386_fbsd_60.h +++ b/src/config/param.i386_fbsd_60.h @@ -1,181 +1,34 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H +/* Machine / Operating system information */ +#define SYS_NAME "i386_fbsd_60" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_60 + #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 #define AFS_FBSD53_ENV 1 #define AFS_FBSD60_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VM_RDWR_ENV 1 -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif -#define SYS_NAME "i386_fbsd_60" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_60 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ -#define AFSLITTLE_ENDIAN 1 - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ +#define AFS_X86_FBSD50_ENV 1 +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -/* Machine / Operating system information */ -#include -#define SYS_NAME "i386_fbsd_60" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_60 - -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_61.h b/src/config/param.i386_fbsd_61.h index 46f2e2e5d..778dabf72 100644 --- a/src/config/param.i386_fbsd_61.h +++ b/src/config/param.i386_fbsd_61.h @@ -5,173 +5,33 @@ #define SYS_NAME "i386_fbsd_61" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_61 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 #define AFS_FBSD53_ENV 1 #define AFS_FBSD60_ENV 1 #define AFS_FBSD61_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ +#define AFS_X86_FBSD50_ENV 1 +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_62.h b/src/config/param.i386_fbsd_62.h index 3bfecba9c..347b7ac17 100644 --- a/src/config/param.i386_fbsd_62.h +++ b/src/config/param.i386_fbsd_62.h @@ -5,26 +5,9 @@ #define SYS_NAME "i386_fbsd_62" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_62 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - - #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -32,151 +15,26 @@ #define AFS_FBSD60_ENV 1 #define AFS_FBSD61_ENV 1 #define AFS_FBSD62_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 #define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD62_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_70.h b/src/config/param.i386_fbsd_70.h index 2c2ea7190..ce73fd08c 100644 --- a/src/config/param.i386_fbsd_70.h +++ b/src/config/param.i386_fbsd_70.h @@ -5,26 +5,11 @@ #define SYS_NAME "i386_fbsd_70" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_70 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -33,152 +18,28 @@ #define AFS_FBSD61_ENV 1 #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_71.h b/src/config/param.i386_fbsd_71.h index f2bbdd4ac..78e8c0170 100644 --- a/src/config/param.i386_fbsd_71.h +++ b/src/config/param.i386_fbsd_71.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_71" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_71 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,154 +19,30 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_72.h b/src/config/param.i386_fbsd_72.h index ed658e1a9..d12bf5470 100644 --- a/src/config/param.i386_fbsd_72.h +++ b/src/config/param.i386_fbsd_72.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_72" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_72 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -36,156 +20,32 @@ #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 #define AFS_FBSD72_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 #define AFS_X86_FBSD72_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD72_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_73.h b/src/config/param.i386_fbsd_73.h index caab1c885..42978576a 100644 --- a/src/config/param.i386_fbsd_73.h +++ b/src/config/param.i386_fbsd_73.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_73" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_73 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -37,158 +21,34 @@ #define AFS_FBSD71_ENV 1 #define AFS_FBSD72_ENV 1 #define AFS_FBSD73_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 #define AFS_X86_FBSD72_ENV 1 #define AFS_X86_FBSD73_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD72_ENV 1 -#define AFS_USR_FBSD73_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_74.h b/src/config/param.i386_fbsd_74.h index 8eef514be..c74133fab 100644 --- a/src/config/param.i386_fbsd_74.h +++ b/src/config/param.i386_fbsd_74.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_74" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_74 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -38,160 +22,35 @@ #define AFS_FBSD72_ENV 1 #define AFS_FBSD73_ENV 1 #define AFS_FBSD74_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 #define AFS_X86_FBSD72_ENV 1 -#define AFS_X86_FBSD73_ENV 1 #define AFS_X86_FBSD74_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD72_ENV 1 -#define AFS_USR_FBSD73_ENV 1 -#define AFS_USR_FBSD74_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD74_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_80.h b/src/config/param.i386_fbsd_80.h index 55aeaaa04..02a52d363 100644 --- a/src/config/param.i386_fbsd_80.h +++ b/src/config/param.i386_fbsd_80.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_80" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_80 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,157 +19,40 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_81.h b/src/config/param.i386_fbsd_81.h index 949921956..5112efe30 100644 --- a/src/config/param.i386_fbsd_81.h +++ b/src/config/param.i386_fbsd_81.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_81" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_81 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,160 +19,43 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_82.h b/src/config/param.i386_fbsd_82.h index 82fa6dcb3..12f15c492 100644 --- a/src/config/param.i386_fbsd_82.h +++ b/src/config/param.i386_fbsd_82.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_82" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_82 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,163 +19,46 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_FBSD82_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_83.h b/src/config/param.i386_fbsd_83.h index d5b1961d8..9116291d8 100644 --- a/src/config/param.i386_fbsd_83.h +++ b/src/config/param.i386_fbsd_83.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_83" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_83 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,166 +19,49 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_FBSD82_ENV 1 #define AFS_FBSD83_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD82_ENV 1 #define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_84.h b/src/config/param.i386_fbsd_84.h index c16b403cc..5e6eab937 100644 --- a/src/config/param.i386_fbsd_84.h +++ b/src/config/param.i386_fbsd_84.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_84" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_84 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,169 +19,52 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_FBSD82_ENV 1 #define AFS_FBSD83_ENV 1 #define AFS_FBSD84_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD82_ENV 1 #define AFS_X86_FBSD83_ENV 1 #define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_90.h b/src/config/param.i386_fbsd_90.h index 231bf3674..c35cc2446 100644 --- a/src/config/param.i386_fbsd_90.h +++ b/src/config/param.i386_fbsd_90.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_90" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_90 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,163 +19,55 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_91.h b/src/config/param.i386_fbsd_91.h index a4dc2b14a..9ab6de4d3 100644 --- a/src/config/param.i386_fbsd_91.h +++ b/src/config/param.i386_fbsd_91.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_91" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_91 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,166 +19,58 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_92.h b/src/config/param.i386_fbsd_92.h index 92a71e666..d084b58b3 100644 --- a/src/config/param.i386_fbsd_92.h +++ b/src/config/param.i386_fbsd_92.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_92" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_92 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,169 +19,61 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 #define AFS_FBSD92_ENV 1 -#define AFS_X86_FBSD_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 #define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_93.h b/src/config/param.i386_fbsd_93.h index 774d65f61..39086a7dd 100644 --- a/src/config/param.i386_fbsd_93.h +++ b/src/config/param.i386_fbsd_93.h @@ -5,27 +5,11 @@ #define SYS_NAME "i386_fbsd_93" #define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_93 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System does support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - +#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#ifndef IGNORE_STDS_H -#include -#endif - -#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ -#define AFS_X86_XBSD_ENV 1 - -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_CLIENT 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -35,172 +19,64 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 +#define AFS_FBSD72_ENV 1 +#define AFS_FBSD73_ENV 1 +#define AFS_FBSD74_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 +#define AFS_FBSD82_ENV 1 +#define AFS_FBSD83_ENV 1 +#define AFS_FBSD84_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 #define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_X86_FBSD_ENV 1 +#define AFS_FBSD93_ENV 1 + #define AFS_X86_FBSD50_ENV 1 -#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ +#define AFS_X86_FBSD51_ENV 1 +#define AFS_X86_FBSD52_ENV 1 +#define AFS_X86_FBSD53_ENV 1 +#define AFS_X86_FBSD60_ENV 1 +#define AFS_X86_FBSD61_ENV 1 #define AFS_X86_FBSD62_ENV 1 #define AFS_X86_FBSD70_ENV 1 #define AFS_X86_FBSD71_ENV 1 +#define AFS_X86_FBSD72_ENV 1 +#define AFS_X86_FBSD74_ENV 1 #define AFS_X86_FBSD80_ENV 1 #define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD82_ENV 1 +#define AFS_X86_FBSD83_ENV 1 +#define AFS_X86_FBSD84_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 #define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define FTRUNC O_TRUNC - -#define IUPD 0x0010 -#define IACC 0x0020 -#define ICHG 0x0040 -#define IMOD 0x0080 - -#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ - NULL, curproc) -#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ - NULL, curproc) - -#include - -#define AFS_VFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_GREEDY43_ENV 1 -#define AFS_ENV 1 - -#define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" - -#ifndef MOUNT_UFS -#define MOUNT_UFS "ufs" -#endif - -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ - -/* Extra kernel definitions (from kdefs file) */ -#ifdef _KERNEL -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_resid uio_resid -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) -#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) -#undef AFS_KALLOC_NOSLEEP -#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) -#define AFS_KFREE(x,y) osi_fbsd_free((x)) -#define v_count v_usecount -#define v_vfsp v_mount -#define vfs_bsize mnt_stat.f_bsize -#define vfs_fsid mnt_stat.f_fsid -#define va_nodeid va_fileid -#define vfs_vnodecovered mnt_vnodecovered -#define direct dirent -#define vnode_t struct vnode - -#ifndef MUTEX_DEFAULT -#define MUTEX_DEFAULT 0 -#endif /* MUTEX_DEFAULT */ - -#ifndef SSYS -#define SSYS 0x00002 -#endif /* SSYS */ - -#define p_rcred p_ucred - -#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) -enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - -#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ -#endif /* _KERNEL */ +#define AFS_X86_FBSD93_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD50_ENV 1 -#define AFS_USR_FBSD51_ENV 1 -#define AFS_USR_FBSD52_ENV 1 -#define AFS_USR_FBSD53_ENV 1 -#define AFS_USR_FBSD60_ENV 1 -#define AFS_USR_FBSD61_ENV 1 -#define AFS_USR_FBSD70_ENV 1 -#define AFS_USR_FBSD71_ENV 1 -#define AFS_USR_FBSD80_ENV 1 -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 339 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - -#include - -#define afsio_iov uio_iov -#define afsio_iovcnt uio_iovcnt -#define afsio_offset uio_offset -#define afsio_seg uio_segflg -#define afsio_fmode uio_fmode -#define afsio_resid uio_resid -#define AFS_UIOSYS 1 -#define AFS_UIOUSER UIO_USERSPACE -#define AFS_CLBYTES MCLBYTES -#define AFS_MINCHANGE 2 -#define VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#include -#include -#include -#include -#include -#include -#include -#include +#define AFS_USR_FBSD50_ENV 1 +#define AFS_USR_FBSD51_ENV 1 +#define AFS_USR_FBSD52_ENV 1 +#define AFS_USR_FBSD53_ENV 1 +#define AFS_USR_FBSD60_ENV 1 +#define AFS_USR_FBSD61_ENV 1 +#define AFS_USR_FBSD62_ENV 1 +#define AFS_USR_FBSD70_ENV 1 +#define AFS_USR_FBSD71_ENV 1 +#define AFS_USR_FBSD72_ENV 1 +#define AFS_USR_FBSD73_ENV 1 +#define AFS_USR_FBSD80_ENV 1 +#define AFS_USR_FBSD81_ENV 1 +#define AFS_USR_FBSD82_ENV 1 +#define AFS_USR_FBSD83_ENV 1 +#define AFS_USR_FBSD84_ENV 1 +#define AFS_USR_FBSD90_ENV 1 +#define AFS_USR_FBSD91_ENV 1 +#define AFS_USR_FBSD92_ENV 1 +#define AFS_USR_FBSD93_ENV 1 #endif /* !defined(UKERNEL) */ -- 2.39.5