From: Ben Kaduk Date: Thu, 28 Jun 2012 02:04:24 +0000 (-0400) Subject: Patch up FreeBSD-10 support X-Git-Tag: upstream/1.6.2_pre2^2~92 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2a478d422fc3d0c0ee047702682bad6ce2bcf028;p=packages%2Fo%2Fopenafs.git Patch up FreeBSD-10 support The auto-guessing code for sysnames produces *_fbsd_100, so we can't just claim that we'll be *_fbsd_1000 for kicks. Revert back to the old behavior so as to be less disruptive. Reviewed-on: http://gerrit.openafs.org/7595 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 44ca4aa90ef101fb13b3b5327ca19381b5464fb3) Change-Id: I302b9f36913b6cd86f65b7263c85d91745330ae6 Reviewed-on: http://gerrit.openafs.org/8341 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 855d1d921..96dda28a3 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -206,7 +206,7 @@ #define SYS_NAME_ID_i386_fbsd_84 2123 #define SYS_NAME_ID_i386_fbsd_90 2120 #define SYS_NAME_ID_i386_fbsd_91 2122 -#define SYS_NAME_ID_i386_fbsd_1000 2130 +#define SYS_NAME_ID_i386_fbsd_100 2130 #define SYS_NAME_ID_ia64_linux2 2200 #define SYS_NAME_ID_ia64_linux22 2201 @@ -302,7 +302,7 @@ #define SYS_NAME_ID_amd64_fbsd_84 3015 #define SYS_NAME_ID_amd64_fbsd_90 3020 #define SYS_NAME_ID_amd64_fbsd_91 3022 -#define SYS_NAME_ID_amd64_fbsd_1000 3030 +#define SYS_NAME_ID_amd64_fbsd_100 3030 #define SYS_NAME_ID_amd64_w2k 3400 diff --git a/src/config/param.amd64_fbsd_100.h b/src/config/param.amd64_fbsd_100.h new file mode 100644 index 000000000..6fba1b49f --- /dev/null +++ b/src/config/param.amd64_fbsd_100.h @@ -0,0 +1,215 @@ +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +/* Machine / Operating system information */ +#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 doesn't 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_ENV 1 +#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 +#define AFS_FBSD53_ENV 1 +#define AFS_FBSD60_ENV 1 +#define AFS_FBSD61_ENV 1 +#define AFS_FBSD62_ENV 1 +#define AFS_FBSD70_ENV 1 +#define AFS_FBSD71_ENV 1 +#define AFS_FBSD80_ENV 1 +#define AFS_FBSD81_ENV 1 +#define AFS_FBSD90_ENV 1 +#define AFS_FBSD91_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_FBSD80_ENV 1 +#define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD90_ENV 1 +#define AFS_X86_FBSD91_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 AFS_SHORTGID 0 /* are group id's short? */ +#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_ENV 1 +#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 + +#endif /* !defined(UKERNEL) */ + +/* general user-space compiles */ + +#if defined(UKERNEL) || !defined(KERNEL) +#define STDLIB_HAS_MALLOC_PROTOS 1 +#endif + +#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_1000.h b/src/config/param.amd64_fbsd_1000.h deleted file mode 100644 index 803160d77..000000000 --- a/src/config/param.amd64_fbsd_1000.h +++ /dev/null @@ -1,215 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_1000" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_1000 - -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System doesn't 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_ENV 1 -#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 -#define AFS_FBSD53_ENV 1 -#define AFS_FBSD60_ENV 1 -#define AFS_FBSD61_ENV 1 -#define AFS_FBSD62_ENV 1 -#define AFS_FBSD70_ENV 1 -#define AFS_FBSD71_ENV 1 -#define AFS_FBSD80_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD1000_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_FBSD80_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD1000_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 AFS_SHORTGID 0 /* are group id's short? */ -#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_FBSD1000_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_ENV 1 -#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 - -#endif /* !defined(UKERNEL) */ - -/* general user-space compiles */ - -#if defined(UKERNEL) || !defined(KERNEL) -#define STDLIB_HAS_MALLOC_PROTOS 1 -#endif - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_100.h b/src/config/param.i386_fbsd_100.h new file mode 100644 index 000000000..3e33b57a1 --- /dev/null +++ b/src/config/param.i386_fbsd_100.h @@ -0,0 +1,213 @@ +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +/* Machine / Operating system information */ +#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 doesn't 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 */ + + +#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_ENV 1 +#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_FBSD62_ENV 1 +#define AFS_FBSD70_ENV 1 +#define AFS_FBSD71_ENV 1 +#define AFS_FBSD80_ENV 1 +#define AFS_FBSD81_ENV 1 +#define AFS_FBSD90_ENV 1 +#define AFS_FBSD91_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_FBSD80_ENV 1 +#define AFS_X86_FBSD81_ENV 1 +#define AFS_X86_FBSD90_ENV 1 +#define AFS_X86_FBSD91_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 AFS_SHORTGID 0 /* are group id's short? */ +#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_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 + +#endif /* !defined(UKERNEL) */ + +/* general user-space compiles */ + +#if defined(UKERNEL) || !defined(KERNEL) +#define STDLIB_HAS_MALLOC_PROTOS 1 +#endif + +#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_1000.h b/src/config/param.i386_fbsd_1000.h deleted file mode 100644 index 66d342df6..000000000 --- a/src/config/param.i386_fbsd_1000.h +++ /dev/null @@ -1,213 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_1000" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_1000 - -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 1 /* System doesn't 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 */ - - -#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_ENV 1 -#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_FBSD62_ENV 1 -#define AFS_FBSD70_ENV 1 -#define AFS_FBSD71_ENV 1 -#define AFS_FBSD80_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD1000_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_FBSD80_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD1000_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 AFS_SHORTGID 0 /* are group id's short? */ -#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_FBSD1000_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_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 - -#endif /* !defined(UKERNEL) */ - -/* general user-space compiles */ - -#if defined(UKERNEL) || !defined(KERNEL) -#define STDLIB_HAS_MALLOC_PROTOS 1 -#endif - -#endif /* AFS_PARAM_H */