Attachment #148319 for bug #194362

Lines 21-27 Link Here

(-)Makefile (-1 / +1 lines)
21	LICENSE_FILE= ${WRKSRC}/doc/LICENSE	21	LICENSE_FILE= ${WRKSRC}/doc/LICENSE
22	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	22	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
23		23
24	AFS_DISTVERSION= 1.6.9	24	AFS_DISTVERSION= 1.6.10
25	DBVERSION= 2013-01-28	25	DBVERSION= 2013-01-28
26		26
27	USES= kmod tar:bzip2	27	USES= kmod tar:bzip2

Lines 1-6 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (openafs-1.6.9-src.tar.bz2) = 7b2ea3a1f77a5cc38f311963c7db0b6d89c0d69796453d72051c846bffe14fc7	1	SHA256 (openafs-1.6.10-src.tar.bz2) = 9158bfe90b4fffbf616916ba8eb98d930f624a61e299146913cdb669f2ec69e8
2	SIZE (openafs-1.6.9-src.tar.bz2) = 14598147	2	SIZE (openafs-1.6.10-src.tar.bz2) = 14592585
3	SHA256 (openafs-1.6.9-doc.tar.bz2) = c1a4d325ca0403e8a909578df06ef3a9606015eaaa35a06520d495218b111e43	3	SHA256 (openafs-1.6.10-doc.tar.bz2) = 6e5fc15b82587d56b40ca806e371b3b82893415579281ec1e1dc53fa854a0173
4	SIZE (openafs-1.6.9-doc.tar.bz2) = 3521690	4	SIZE (openafs-1.6.10-doc.tar.bz2) = 3529991
5	SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17	5	SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17
6	SIZE (CellServDB.2013-01-28) = 36787	6	SIZE (CellServDB.2013-01-28) = 36787




--- Makefile.in.orig	2012-03-27 08:03:34.000000000 +0900
+++ Makefile.in	2012-06-24 06:37:47.000000000 +0900
@@ -338,6 +338,7 @@

 venus: cmd comerr volser ptserver libafscp
 	+${COMPILE_PART1} venus ${COMPILE_PART2}
+venus-test:: venus
 	+${COMPILE_PART1} venus/test ${COMPILE_PART2}

 afsd: cmd comerr sys kauth @CLIENT_UAFS_DEP@
@@ -666,7 +667,7 @@
 finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log \
 	ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \
 	dviced dvolser libafscp \
-	venus update xstat afsmonitor rxdebug libafsrpc \
+	venus venus-test update xstat afsmonitor rxdebug libafsrpc \
 	libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
 	platform kopenafs authtools
 	+${COMPILE_PART1} finale ${COMPILE_PART2}
@@ -674,7 +675,7 @@
 finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log \
 	ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \
 	dviced dvolser libafscp\
-	venus update xstat afsmonitor rxdebug libafsrpc \
+	venus venus-test update xstat afsmonitor rxdebug libafsrpc \
 	libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
 	platform kopenafs authtools
 	+${COMPILE_PART1} finale ${COMPILE_PART2}

Lines 1-6 Link Here

(-)files/patch-src-rx-rx_kernel.h (-3 / +11 lines)
1	--- src/rx/rx_kernel.h.orig 2014-09-11 17:20:18.000000000 +0900	1	--- src/rx/rx_kernel.h.orig 2014-09-24 10:17:09.000000000 -0400
2	+++ src/rx/rx_kernel.h 2014-09-11 17:23:52.000000000 +0900	2	+++ src/rx/rx_kernel.h 2014-09-28 20:37:20.000000000 -0400
3	@@ -59,7 +59,13 @@	3	@@ -54,12 +54,20 @@
		4	#endif
		5	#define rx_ifnet_mtu(x) (x)->if_mtu
		6	#define rx_ifnet_flags(x) (x?(x)->if_flags:0)
		7	-#if defined(AFS_OBSD46_ENV) \|\| defined(AFS_FBSD81_ENV)
		8	+#if __FreeBSD_version >= 1100032
		9	+#define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0, RT_ALL_FIBS)
		10	+#elif defined(AFS_OBSD46_ENV) \|\| defined(AFS_FBSD81_ENV)
		11	#define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0)
4	#else	12	#else
5	#define rx_ifaddr_withnet(x) ifa_ifwithnet(x)	13	#define rx_ifaddr_withnet(x) ifa_ifwithnet(x)
6	#endif	14	#endif




diff --git src/config/afs_sysnames.h src/config/afs_sysnames.h
index 62b18f3..8687a6c 100644
--- src/config/afs_sysnames.h
+++ src/config/afs_sysnames.h
@@ -213,7 +213,9 @@
 #define SYS_NAME_ID_i386_fbsd_90        2120
 #define SYS_NAME_ID_i386_fbsd_91        2122
 #define SYS_NAME_ID_i386_fbsd_92        2124
+#define SYS_NAME_ID_i386_fbsd_93        2126
 #define SYS_NAME_ID_i386_fbsd_100      2130
+#define SYS_NAME_ID_i386_fbsd_101      2131
 #define SYS_NAME_ID_i386_fbsd_110      2140
 
 #define SYS_NAME_ID_ia64_linux2		2200
@@ -316,7 +318,9 @@
 #define SYS_NAME_ID_amd64_fbsd_90       3020
 #define SYS_NAME_ID_amd64_fbsd_91       3022
 #define SYS_NAME_ID_amd64_fbsd_92       3023
+#define SYS_NAME_ID_amd64_fbsd_93       3024
 #define SYS_NAME_ID_amd64_fbsd_100     3030
+#define SYS_NAME_ID_amd64_fbsd_101     3031
 #define SYS_NAME_ID_amd64_fbsd_110     3040
 
 #define SYS_NAME_ID_amd64_w2k           3400




diff --git src/config/param.amd64_fbsd_101.h src/config/param.amd64_fbsd_101.h
new file mode 100644
index 0000000..73eda56
--- /dev/null
+++ src/config/param.amd64_fbsd_101.h
@@ -0,0 +1,218 @@
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+/* Machine / Operating system information */
+#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 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 <sys/param.h>
+#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_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_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_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 <afs/afs_sysnames.h>
+
+#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_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_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 <afs/afs_sysnames.h>
+
+#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 <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#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 src/config/param.amd64_fbsd_93.h src/config/param.amd64_fbsd_93.h
new file mode 100644
index 0000000..18ebf30
--- /dev/null
+++ src/config/param.amd64_fbsd_93.h
@@ -0,0 +1,218 @@
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+/* Machine / Operating system information */
+#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 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 <sys/param.h>
+#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_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_FBSD80_ENV 1
+#define AFS_X86_FBSD81_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 <afs/afs_sysnames.h>
+
+#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_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_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 <afs/afs_sysnames.h>
+
+#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 <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#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 src/config/param.i386_fbsd_101.h src/config/param.i386_fbsd_101.h
new file mode 100644
index 0000000..dd89daf
--- /dev/null
+++ src/config/param.i386_fbsd_101.h
@@ -0,0 +1,216 @@
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+/* Machine / Operating system information */
+#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 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 <sys/param.h>
+#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_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_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_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 <afs/afs_sysnames.h>
+
+#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_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_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 <afs/afs_sysnames.h>
+
+#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 <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#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 src/config/param.i386_fbsd_93.h src/config/param.i386_fbsd_93.h
new file mode 100644
index 0000000..db67f92
--- /dev/null
+++ src/config/param.i386_fbsd_93.h
@@ -0,0 +1,216 @@
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+/* Machine / Operating system information */
+#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 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 <sys/param.h>
+#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_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_FBSD80_ENV 1
+#define AFS_X86_FBSD81_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 <afs/afs_sysnames.h>
+
+#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_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_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 <afs/afs_sysnames.h>
+
+#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 <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#endif /* !defined(UKERNEL) */
+
+/* general user-space compiles */
+
+#if defined(UKERNEL) || !defined(KERNEL)
+#define STDLIB_HAS_MALLOC_PROTOS 1
+#endif
+
+#endif /* AFS_PARAM_H */

Return to bug 194362

Lines 1-28 Link Here

(-)files/patch-Makefile.in (-28 lines)
1	--- Makefile.in.orig 2012-03-27 08:03:34.000000000 +0900
2	+++ Makefile.in 2012-06-24 06:37:47.000000000 +0900
3	@@ -338,6 +338,7 @@
4
5	venus: cmd comerr volser ptserver libafscp
6	+${COMPILE_PART1} venus ${COMPILE_PART2}
7	+venus-test:: venus
8	+${COMPILE_PART1} venus/test ${COMPILE_PART2}
9
10	afsd: cmd comerr sys kauth @CLIENT_UAFS_DEP@
11	@@ -666,7 +667,7 @@
12	finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log \
13	ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \
14	dviced dvolser libafscp \
15	- venus update xstat afsmonitor rxdebug libafsrpc \
16	+ venus venus-test update xstat afsmonitor rxdebug libafsrpc \
17	libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
18	platform kopenafs authtools
19	+${COMPILE_PART1} finale ${COMPILE_PART2}
20	@@ -674,7 +675,7 @@
21	finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log \
22	ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \
23	dviced dvolser libafscp\
24	- venus update xstat afsmonitor rxdebug libafsrpc \
25	+ venus venus-test update xstat afsmonitor rxdebug libafsrpc \
26	libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
27	platform kopenafs authtools
28	+${COMPILE_PART1} finale ${COMPILE_PART2}

Lines 1-24 Link Here

(-)files/patch-src__config__afs_sysnames.h (-24 lines)
1	diff --git src/config/afs_sysnames.h src/config/afs_sysnames.h
2	index 62b18f3..8687a6c 100644
3	--- src/config/afs_sysnames.h
4	+++ src/config/afs_sysnames.h
5	@@ -213,7 +213,9 @@
6	#define SYS_NAME_ID_i386_fbsd_90 2120
7	#define SYS_NAME_ID_i386_fbsd_91 2122
8	#define SYS_NAME_ID_i386_fbsd_92 2124
9	+#define SYS_NAME_ID_i386_fbsd_93 2126
10	#define SYS_NAME_ID_i386_fbsd_100 2130
11	+#define SYS_NAME_ID_i386_fbsd_101 2131
12	#define SYS_NAME_ID_i386_fbsd_110 2140
13
14	#define SYS_NAME_ID_ia64_linux2 2200
15	@@ -316,7 +318,9 @@
16	#define SYS_NAME_ID_amd64_fbsd_90 3020
17	#define SYS_NAME_ID_amd64_fbsd_91 3022
18	#define SYS_NAME_ID_amd64_fbsd_92 3023
19	+#define SYS_NAME_ID_amd64_fbsd_93 3024
20	#define SYS_NAME_ID_amd64_fbsd_100 3030
21	+#define SYS_NAME_ID_amd64_fbsd_101 3031
22	#define SYS_NAME_ID_amd64_fbsd_110 3040
23
24	#define SYS_NAME_ID_amd64_w2k 3400

Lines 1-224 Link Here

(-)files/patch-src__config__param.amd64_fbsd_101.h (-224 lines)
1	diff --git src/config/param.amd64_fbsd_101.h src/config/param.amd64_fbsd_101.h
2	new file mode 100644
3	index 0000000..73eda56
4	--- /dev/null
5	+++ src/config/param.amd64_fbsd_101.h
6	@@ -0,0 +1,218 @@
7	+#ifndef AFS_PARAM_H
8	+#define AFS_PARAM_H
9	+
10	+/* Machine / Operating system information */
11	+#define SYS_NAME "amd64_fbsd_101"
12	+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_101
13	+
14	+#define AFSLITTLE_ENDIAN 1
15	+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
16	+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
17	+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
18	+
19	+
20	+#ifndef UKERNEL
21	+/* This section for kernel libafs compiles only */
22	+
23	+#ifndef IGNORE_STDS_H
24	+#include <sys/param.h>
25	+#endif
26	+
27	+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
28	+#define AFS_X86_XBSD_ENV 1
29	+
30	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
31	+#define AFS_64BIT_ENV 1
32	+#define AFS_64BIT_CLIENT 1
33	+#define AFS_64BITPOINTER_ENV 1
34	+#define AFS_64BITUSERPOINTER_ENV 1
35	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
36	+#define AFS_FBSD_ENV 1
37	+#define AFS_FBSD50_ENV 1
38	+#define AFS_FBSD51_ENV 1
39	+#define AFS_FBSD52_ENV 1
40	+#define AFS_FBSD53_ENV 1
41	+#define AFS_FBSD60_ENV 1
42	+#define AFS_FBSD61_ENV 1
43	+#define AFS_FBSD62_ENV 1
44	+#define AFS_FBSD70_ENV 1
45	+#define AFS_FBSD71_ENV 1
46	+#define AFS_FBSD80_ENV 1
47	+#define AFS_FBSD81_ENV 1
48	+#define AFS_FBSD90_ENV 1
49	+#define AFS_FBSD91_ENV 1
50	+#define AFS_FBSD100_ENV 1
51	+#define AFS_FBSD101_ENV 1
52	+#define AFS_X86_FBSD_ENV 1
53	+#define AFS_X86_FBSD50_ENV 1
54	+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
55	+#define AFS_X86_FBSD62_ENV 1
56	+#define AFS_X86_FBSD70_ENV 1
57	+#define AFS_X86_FBSD71_ENV 1
58	+#define AFS_X86_FBSD80_ENV 1
59	+#define AFS_X86_FBSD81_ENV 1
60	+#define AFS_X86_FBSD90_ENV 1
61	+#define AFS_X86_FBSD91_ENV 1
62	+#define AFS_X86_FBSD100_ENV 1
63	+#define AFS_X86_FBSD101_ENV 1
64	+#define AFS_X86_ENV 1
65	+#undef AFS_NONFSTRANS
66	+#define AFS_NONFSTRANS 1
67	+#define FTRUNC O_TRUNC
68	+
69	+#define IUPD 0x0010
70	+#define IACC 0x0020
71	+#define ICHG 0x0040
72	+#define IMOD 0x0080
73	+
74	+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
75	+ NULL, curproc)
76	+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
77	+ NULL, curproc)
78	+
79	+#include <afs/afs_sysnames.h>
80	+
81	+#define AFS_VFS_ENV 1
82	+#define AFS_VFSINCL_ENV 1
83	+#define AFS_GREEDY43_ENV 1
84	+#define AFS_ENV 1
85	+
86	+#define AFS_SYSCALL 339
87	+#define AFS_MOUNT_AFS "afs"
88	+
89	+#ifndef MOUNT_UFS
90	+#define MOUNT_UFS "ufs"
91	+#endif
92	+
93	+#ifndef MOUNT_AFS
94	+#define MOUNT_AFS AFS_MOUNT_AFS
95	+#endif
96	+
97	+#define RXK_LISTENER_ENV 1
98	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
99	+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
100	+
101	+/* Extra kernel definitions (from kdefs file) */
102	+#ifdef _KERNEL
103	+#define AFS_GLOBAL_SUNLOCK 1
104	+#define AFS_VFS34 1 /* What is VFS34??? */
105	+#define AFS_SHORTGID 0 /* are group id's short? */
106	+#define afsio_iov uio_iov
107	+#define afsio_iovcnt uio_iovcnt
108	+#define afsio_offset uio_offset
109	+#define afsio_seg uio_segflg
110	+#define afsio_resid uio_resid
111	+#define AFS_UIOSYS UIO_SYSSPACE
112	+#define AFS_UIOUSER UIO_USERSPACE
113	+#define AFS_CLBYTES CLBYTES
114	+#define osi_GetTime(x) microtime(x)
115	+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
116	+#undef AFS_KALLOC_NOSLEEP
117	+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
118	+#define AFS_KFREE(x,y) osi_fbsd_free((x))
119	+#define v_count v_usecount
120	+#define v_vfsp v_mount
121	+#define vfs_bsize mnt_stat.f_bsize
122	+#define vfs_fsid mnt_stat.f_fsid
123	+#define va_nodeid va_fileid
124	+#define vfs_vnodecovered mnt_vnodecovered
125	+#define direct dirent
126	+#define vnode_t struct vnode
127	+
128	+#ifndef MUTEX_DEFAULT
129	+#define MUTEX_DEFAULT 0
130	+#endif /* MUTEX_DEFAULT */
131	+
132	+#ifndef SSYS
133	+#define SSYS 0x00002
134	+#endif /* SSYS */
135	+
136	+#define p_rcred p_ucred
137	+
138	+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
139	+enum vcexcl { NONEXCL, EXCL };
140	+
141	+#ifdef KERNEL
142	+#ifndef MIN
143	+#define MIN(A,B) ((A) < (B) ? (A) : (B))
144	+#endif
145	+#ifndef MAX
146	+#define MAX(A,B) ((A) > (B) ? (A) : (B))
147	+#endif
148	+#endif /* KERNEL */
149	+
150	+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
151	+#endif /* _KERNEL */
152	+
153	+#else /* !defined(UKERNEL) */
154	+
155	+/* This section for user space compiles only */
156	+
157	+#define UKERNEL 1 /* user space kernel */
158	+#define AFS_ENV 1
159	+#define AFS_VFSINCL_ENV 1
160	+#define AFS_USR_FBSD50_ENV 1
161	+#define AFS_USR_FBSD51_ENV 1
162	+#define AFS_USR_FBSD52_ENV 1
163	+#define AFS_USR_FBSD53_ENV 1
164	+#define AFS_USR_FBSD60_ENV 1
165	+#define AFS_USR_FBSD61_ENV 1
166	+#define AFS_USR_FBSD70_ENV 1
167	+#define AFS_USR_FBSD71_ENV 1
168	+#define AFS_USR_FBSD80_ENV 1
169	+#define AFS_USR_FBSD81_ENV 1
170	+#define AFS_USR_FBSD90_ENV 1
171	+#define AFS_USR_FBSD91_ENV 1
172	+#define AFS_USR_FBSD100_ENV 1
173	+#define AFS_USR_FBSD101_ENV 1
174	+#define AFS_USR_FBSD_ENV 1
175	+#undef AFS_NONFSTRANS
176	+#define AFS_NONFSTRANS 1
177	+
178	+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
179	+#define AFS_SYSCALL 339
180	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
181	+#define AFS_64BIT_ENV 1
182	+#define AFS_64BITPOINTER_ENV 1
183	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
184	+#define AFS_USERSPACE_IP_ADDR 1
185	+#define RXK_LISTENER_ENV 1
186	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
187	+
188	+#include <afs/afs_sysnames.h>
189	+
190	+#define afsio_iov uio_iov
191	+#define afsio_iovcnt uio_iovcnt
192	+#define afsio_offset uio_offset
193	+#define afsio_seg uio_segflg
194	+#define afsio_fmode uio_fmode
195	+#define afsio_resid uio_resid
196	+#define AFS_UIOSYS 1
197	+#define AFS_UIOUSER UIO_USERSPACE
198	+#define AFS_CLBYTES MCLBYTES
199	+#define AFS_MINCHANGE 2
200	+#define VATTR_NULL usr_vattr_null
201	+
202	+#define AFS_DIRENT
203	+#ifndef CMSERVERPREF
204	+#define CMSERVERPREF
205	+#endif
206	+
207	+#include <sys/param.h>
208	+#include <sys/types.h>
209	+#include <sys/mount.h>
210	+#include <sys/fcntl.h>
211	+#include <sys/uio.h>
212	+#include <sys/socket.h>
213	+#include <netinet/in.h>
214	+#include <limits.h>
215	+
216	+#endif /* !defined(UKERNEL) */
217	+
218	+/* general user-space compiles */
219	+
220	+#if defined(UKERNEL) \|\| !defined(KERNEL)
221	+#define STDLIB_HAS_MALLOC_PROTOS 1
222	+#endif
223	+
224	+#endif /* AFS_PARAM_H */

Lines 1-224 Link Here

(-)files/patch-src__config__param.amd64_fbsd_93.h (-224 lines)
1	diff --git src/config/param.amd64_fbsd_93.h src/config/param.amd64_fbsd_93.h
2	new file mode 100644
3	index 0000000..18ebf30
4	--- /dev/null
5	+++ src/config/param.amd64_fbsd_93.h
6	@@ -0,0 +1,218 @@
7	+#ifndef AFS_PARAM_H
8	+#define AFS_PARAM_H
9	+
10	+/* Machine / Operating system information */
11	+#define SYS_NAME "amd64_fbsd_93"
12	+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_93
13	+
14	+#define AFSLITTLE_ENDIAN 1
15	+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
16	+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
17	+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
18	+
19	+
20	+#ifndef UKERNEL
21	+/* This section for kernel libafs compiles only */
22	+
23	+#ifndef IGNORE_STDS_H
24	+#include <sys/param.h>
25	+#endif
26	+
27	+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
28	+#define AFS_X86_XBSD_ENV 1
29	+
30	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
31	+#define AFS_64BIT_ENV 1
32	+#define AFS_64BIT_CLIENT 1
33	+#define AFS_64BITPOINTER_ENV 1
34	+#define AFS_64BITUSERPOINTER_ENV 1
35	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
36	+#define AFS_FBSD_ENV 1
37	+#define AFS_FBSD50_ENV 1
38	+#define AFS_FBSD51_ENV 1
39	+#define AFS_FBSD52_ENV 1
40	+#define AFS_FBSD53_ENV 1
41	+#define AFS_FBSD60_ENV 1
42	+#define AFS_FBSD61_ENV 1
43	+#define AFS_FBSD62_ENV 1
44	+#define AFS_FBSD70_ENV 1
45	+#define AFS_FBSD71_ENV 1
46	+#define AFS_FBSD80_ENV 1
47	+#define AFS_FBSD81_ENV 1
48	+#define AFS_FBSD90_ENV 1
49	+#define AFS_FBSD91_ENV 1
50	+#define AFS_FBSD92_ENV 1
51	+#define AFS_FBSD93_ENV 1
52	+#define AFS_X86_FBSD_ENV 1
53	+#define AFS_X86_FBSD50_ENV 1
54	+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
55	+#define AFS_X86_FBSD62_ENV 1
56	+#define AFS_X86_FBSD70_ENV 1
57	+#define AFS_X86_FBSD71_ENV 1
58	+#define AFS_X86_FBSD80_ENV 1
59	+#define AFS_X86_FBSD81_ENV 1
60	+#define AFS_X86_FBSD90_ENV 1
61	+#define AFS_X86_FBSD91_ENV 1
62	+#define AFS_X86_FBSD92_ENV 1
63	+#define AFS_X86_FBSD93_ENV 1
64	+#define AFS_X86_ENV 1
65	+#undef AFS_NONFSTRANS
66	+#define AFS_NONFSTRANS 1
67	+#define FTRUNC O_TRUNC
68	+
69	+#define IUPD 0x0010
70	+#define IACC 0x0020
71	+#define ICHG 0x0040
72	+#define IMOD 0x0080
73	+
74	+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
75	+ NULL, curproc)
76	+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
77	+ NULL, curproc)
78	+
79	+#include <afs/afs_sysnames.h>
80	+
81	+#define AFS_VFS_ENV 1
82	+#define AFS_VFSINCL_ENV 1
83	+#define AFS_GREEDY43_ENV 1
84	+#define AFS_ENV 1
85	+
86	+#define AFS_SYSCALL 339
87	+#define AFS_MOUNT_AFS "afs"
88	+
89	+#ifndef MOUNT_UFS
90	+#define MOUNT_UFS "ufs"
91	+#endif
92	+
93	+#ifndef MOUNT_AFS
94	+#define MOUNT_AFS AFS_MOUNT_AFS
95	+#endif
96	+
97	+#define RXK_LISTENER_ENV 1
98	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
99	+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
100	+
101	+/* Extra kernel definitions (from kdefs file) */
102	+#ifdef _KERNEL
103	+#define AFS_GLOBAL_SUNLOCK 1
104	+#define AFS_VFS34 1 /* What is VFS34??? */
105	+#define AFS_SHORTGID 0 /* are group id's short? */
106	+#define afsio_iov uio_iov
107	+#define afsio_iovcnt uio_iovcnt
108	+#define afsio_offset uio_offset
109	+#define afsio_seg uio_segflg
110	+#define afsio_resid uio_resid
111	+#define AFS_UIOSYS UIO_SYSSPACE
112	+#define AFS_UIOUSER UIO_USERSPACE
113	+#define AFS_CLBYTES CLBYTES
114	+#define osi_GetTime(x) microtime(x)
115	+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
116	+#undef AFS_KALLOC_NOSLEEP
117	+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
118	+#define AFS_KFREE(x,y) osi_fbsd_free((x))
119	+#define v_count v_usecount
120	+#define v_vfsp v_mount
121	+#define vfs_bsize mnt_stat.f_bsize
122	+#define vfs_fsid mnt_stat.f_fsid
123	+#define va_nodeid va_fileid
124	+#define vfs_vnodecovered mnt_vnodecovered
125	+#define direct dirent
126	+#define vnode_t struct vnode
127	+
128	+#ifndef MUTEX_DEFAULT
129	+#define MUTEX_DEFAULT 0
130	+#endif /* MUTEX_DEFAULT */
131	+
132	+#ifndef SSYS
133	+#define SSYS 0x00002
134	+#endif /* SSYS */
135	+
136	+#define p_rcred p_ucred
137	+
138	+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
139	+enum vcexcl { NONEXCL, EXCL };
140	+
141	+#ifdef KERNEL
142	+#ifndef MIN
143	+#define MIN(A,B) ((A) < (B) ? (A) : (B))
144	+#endif
145	+#ifndef MAX
146	+#define MAX(A,B) ((A) > (B) ? (A) : (B))
147	+#endif
148	+#endif /* KERNEL */
149	+
150	+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
151	+#endif /* _KERNEL */
152	+
153	+#else /* !defined(UKERNEL) */
154	+
155	+/* This section for user space compiles only */
156	+
157	+#define UKERNEL 1 /* user space kernel */
158	+#define AFS_ENV 1
159	+#define AFS_VFSINCL_ENV 1
160	+#define AFS_USR_FBSD50_ENV 1
161	+#define AFS_USR_FBSD51_ENV 1
162	+#define AFS_USR_FBSD52_ENV 1
163	+#define AFS_USR_FBSD53_ENV 1
164	+#define AFS_USR_FBSD60_ENV 1
165	+#define AFS_USR_FBSD61_ENV 1
166	+#define AFS_USR_FBSD70_ENV 1
167	+#define AFS_USR_FBSD71_ENV 1
168	+#define AFS_USR_FBSD80_ENV 1
169	+#define AFS_USR_FBSD81_ENV 1
170	+#define AFS_USR_FBSD90_ENV 1
171	+#define AFS_USR_FBSD91_ENV 1
172	+#define AFS_USR_FBSD92_ENV 1
173	+#define AFS_USR_FBSD93_ENV 1
174	+#define AFS_USR_FBSD_ENV 1
175	+#undef AFS_NONFSTRANS
176	+#define AFS_NONFSTRANS 1
177	+
178	+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
179	+#define AFS_SYSCALL 339
180	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
181	+#define AFS_64BIT_ENV 1
182	+#define AFS_64BITPOINTER_ENV 1
183	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
184	+#define AFS_USERSPACE_IP_ADDR 1
185	+#define RXK_LISTENER_ENV 1
186	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
187	+
188	+#include <afs/afs_sysnames.h>
189	+
190	+#define afsio_iov uio_iov
191	+#define afsio_iovcnt uio_iovcnt
192	+#define afsio_offset uio_offset
193	+#define afsio_seg uio_segflg
194	+#define afsio_fmode uio_fmode
195	+#define afsio_resid uio_resid
196	+#define AFS_UIOSYS 1
197	+#define AFS_UIOUSER UIO_USERSPACE
198	+#define AFS_CLBYTES MCLBYTES
199	+#define AFS_MINCHANGE 2
200	+#define VATTR_NULL usr_vattr_null
201	+
202	+#define AFS_DIRENT
203	+#ifndef CMSERVERPREF
204	+#define CMSERVERPREF
205	+#endif
206	+
207	+#include <sys/param.h>
208	+#include <sys/types.h>
209	+#include <sys/mount.h>
210	+#include <sys/fcntl.h>
211	+#include <sys/uio.h>
212	+#include <sys/socket.h>
213	+#include <netinet/in.h>
214	+#include <limits.h>
215	+
216	+#endif /* !defined(UKERNEL) */
217	+
218	+/* general user-space compiles */
219	+
220	+#if defined(UKERNEL) \|\| !defined(KERNEL)
221	+#define STDLIB_HAS_MALLOC_PROTOS 1
222	+#endif
223	+
224	+#endif /* AFS_PARAM_H */

Lines 1-222 Link Here

(-)files/patch-src__config__param.i386_fbsd_101.h (-222 lines)
1	diff --git src/config/param.i386_fbsd_101.h src/config/param.i386_fbsd_101.h
2	new file mode 100644
3	index 0000000..dd89daf
4	--- /dev/null
5	+++ src/config/param.i386_fbsd_101.h
6	@@ -0,0 +1,216 @@
7	+#ifndef AFS_PARAM_H
8	+#define AFS_PARAM_H
9	+
10	+/* Machine / Operating system information */
11	+#define SYS_NAME "i386_fbsd_101"
12	+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_101
13	+
14	+#define AFSLITTLE_ENDIAN 1
15	+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
16	+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
17	+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
18	+#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */
19	+
20	+
21	+#ifndef UKERNEL
22	+/* This section for kernel libafs compiles only */
23	+
24	+#ifndef IGNORE_STDS_H
25	+#include <sys/param.h>
26	+#endif
27	+
28	+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
29	+#define AFS_X86_XBSD_ENV 1
30	+
31	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
32	+#define AFS_64BIT_ENV 1
33	+#define AFS_64BIT_CLIENT 1
34	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
35	+#define AFS_FBSD_ENV 1
36	+#define AFS_FBSD50_ENV 1
37	+#define AFS_FBSD51_ENV 1
38	+#define AFS_FBSD52_ENV 1
39	+#define AFS_FBSD53_ENV 1
40	+#define AFS_FBSD60_ENV 1
41	+#define AFS_FBSD61_ENV 1
42	+#define AFS_FBSD62_ENV 1
43	+#define AFS_FBSD70_ENV 1
44	+#define AFS_FBSD71_ENV 1
45	+#define AFS_FBSD80_ENV 1
46	+#define AFS_FBSD81_ENV 1
47	+#define AFS_FBSD90_ENV 1
48	+#define AFS_FBSD91_ENV 1
49	+#define AFS_FBSD100_ENV 1
50	+#define AFS_FBSD101_ENV 1
51	+#define AFS_X86_FBSD_ENV 1
52	+#define AFS_X86_FBSD50_ENV 1
53	+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
54	+#define AFS_X86_FBSD62_ENV 1
55	+#define AFS_X86_FBSD70_ENV 1
56	+#define AFS_X86_FBSD71_ENV 1
57	+#define AFS_X86_FBSD80_ENV 1
58	+#define AFS_X86_FBSD81_ENV 1
59	+#define AFS_X86_FBSD90_ENV 1
60	+#define AFS_X86_FBSD91_ENV 1
61	+#define AFS_X86_FBSD100_ENV 1
62	+#define AFS_X86_FBSD101_ENV 1
63	+#define AFS_X86_ENV 1
64	+#undef AFS_NONFSTRANS
65	+#define AFS_NONFSTRANS 1
66	+#define FTRUNC O_TRUNC
67	+
68	+#define IUPD 0x0010
69	+#define IACC 0x0020
70	+#define ICHG 0x0040
71	+#define IMOD 0x0080
72	+
73	+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
74	+ NULL, curproc)
75	+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
76	+ NULL, curproc)
77	+
78	+#include <afs/afs_sysnames.h>
79	+
80	+#define AFS_VFS_ENV 1
81	+#define AFS_VFSINCL_ENV 1
82	+#define AFS_GREEDY43_ENV 1
83	+#define AFS_ENV 1
84	+
85	+#define AFS_SYSCALL 339
86	+#define AFS_MOUNT_AFS "afs"
87	+
88	+#ifndef MOUNT_UFS
89	+#define MOUNT_UFS "ufs"
90	+#endif
91	+
92	+#ifndef MOUNT_AFS
93	+#define MOUNT_AFS AFS_MOUNT_AFS
94	+#endif
95	+
96	+#define RXK_LISTENER_ENV 1
97	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
98	+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
99	+
100	+/* Extra kernel definitions (from kdefs file) */
101	+#ifdef _KERNEL
102	+#define AFS_GLOBAL_SUNLOCK 1
103	+#define AFS_VFS34 1 /* What is VFS34??? */
104	+#define AFS_SHORTGID 0 /* are group id's short? */
105	+#define afsio_iov uio_iov
106	+#define afsio_iovcnt uio_iovcnt
107	+#define afsio_offset uio_offset
108	+#define afsio_seg uio_segflg
109	+#define afsio_resid uio_resid
110	+#define AFS_UIOSYS UIO_SYSSPACE
111	+#define AFS_UIOUSER UIO_USERSPACE
112	+#define AFS_CLBYTES CLBYTES
113	+#define osi_GetTime(x) microtime(x)
114	+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
115	+#undef AFS_KALLOC_NOSLEEP
116	+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
117	+#define AFS_KFREE(x,y) osi_fbsd_free((x))
118	+#define v_count v_usecount
119	+#define v_vfsp v_mount
120	+#define vfs_bsize mnt_stat.f_bsize
121	+#define vfs_fsid mnt_stat.f_fsid
122	+#define va_nodeid va_fileid
123	+#define vfs_vnodecovered mnt_vnodecovered
124	+#define direct dirent
125	+#define vnode_t struct vnode
126	+
127	+#ifndef MUTEX_DEFAULT
128	+#define MUTEX_DEFAULT 0
129	+#endif /* MUTEX_DEFAULT */
130	+
131	+#ifndef SSYS
132	+#define SSYS 0x00002
133	+#endif /* SSYS */
134	+
135	+#define p_rcred p_ucred
136	+
137	+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
138	+enum vcexcl { NONEXCL, EXCL };
139	+
140	+#ifdef KERNEL
141	+#ifndef MIN
142	+#define MIN(A,B) ((A) < (B) ? (A) : (B))
143	+#endif
144	+#ifndef MAX
145	+#define MAX(A,B) ((A) > (B) ? (A) : (B))
146	+#endif
147	+#endif /* KERNEL */
148	+
149	+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
150	+#endif /* _KERNEL */
151	+
152	+#else /* !defined(UKERNEL) */
153	+
154	+/* This section for user space compiles only */
155	+
156	+#define UKERNEL 1 /* user space kernel */
157	+#define AFS_ENV 1
158	+#define AFS_VFSINCL_ENV 1
159	+#define AFS_USR_FBSD50_ENV 1
160	+#define AFS_USR_FBSD51_ENV 1
161	+#define AFS_USR_FBSD52_ENV 1
162	+#define AFS_USR_FBSD53_ENV 1
163	+#define AFS_USR_FBSD60_ENV 1
164	+#define AFS_USR_FBSD61_ENV 1
165	+#define AFS_USR_FBSD70_ENV 1
166	+#define AFS_USR_FBSD71_ENV 1
167	+#define AFS_USR_FBSD80_ENV 1
168	+#define AFS_USR_FBSD81_ENV 1
169	+#define AFS_USR_FBSD90_ENV 1
170	+#define AFS_USR_FBSD91_ENV 1
171	+#define AFS_USR_FBSD100_ENV 1
172	+#define AFS_USR_FBSD101_ENV 1
173	+#define AFS_USR_FBSD_ENV 1
174	+#undef AFS_NONFSTRANS
175	+#define AFS_NONFSTRANS 1
176	+
177	+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
178	+#define AFS_SYSCALL 339
179	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
180	+#define AFS_64BIT_ENV 1
181	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
182	+#define AFS_USERSPACE_IP_ADDR 1
183	+#define RXK_LISTENER_ENV 1
184	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
185	+
186	+#include <afs/afs_sysnames.h>
187	+
188	+#define afsio_iov uio_iov
189	+#define afsio_iovcnt uio_iovcnt
190	+#define afsio_offset uio_offset
191	+#define afsio_seg uio_segflg
192	+#define afsio_fmode uio_fmode
193	+#define afsio_resid uio_resid
194	+#define AFS_UIOSYS 1
195	+#define AFS_UIOUSER UIO_USERSPACE
196	+#define AFS_CLBYTES MCLBYTES
197	+#define AFS_MINCHANGE 2
198	+#define VATTR_NULL usr_vattr_null
199	+
200	+#define AFS_DIRENT
201	+#ifndef CMSERVERPREF
202	+#define CMSERVERPREF
203	+#endif
204	+
205	+#include <sys/param.h>
206	+#include <sys/types.h>
207	+#include <sys/mount.h>
208	+#include <sys/fcntl.h>
209	+#include <sys/uio.h>
210	+#include <sys/socket.h>
211	+#include <netinet/in.h>
212	+#include <limits.h>
213	+
214	+#endif /* !defined(UKERNEL) */
215	+
216	+/* general user-space compiles */
217	+
218	+#if defined(UKERNEL) \|\| !defined(KERNEL)
219	+#define STDLIB_HAS_MALLOC_PROTOS 1
220	+#endif
221	+
222	+#endif /* AFS_PARAM_H */

Lines 1-222 Link Here

(-)files/patch-src__config__param.i386_fbsd_93.h (-222 lines)
1	diff --git src/config/param.i386_fbsd_93.h src/config/param.i386_fbsd_93.h
2	new file mode 100644
3	index 0000000..db67f92
4	--- /dev/null
5	+++ src/config/param.i386_fbsd_93.h
6	@@ -0,0 +1,216 @@
7	+#ifndef AFS_PARAM_H
8	+#define AFS_PARAM_H
9	+
10	+/* Machine / Operating system information */
11	+#define SYS_NAME "i386_fbsd_93"
12	+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_93
13	+
14	+#define AFSLITTLE_ENDIAN 1
15	+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
16	+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
17	+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
18	+#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */
19	+
20	+
21	+#ifndef UKERNEL
22	+/* This section for kernel libafs compiles only */
23	+
24	+#ifndef IGNORE_STDS_H
25	+#include <sys/param.h>
26	+#endif
27	+
28	+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
29	+#define AFS_X86_XBSD_ENV 1
30	+
31	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
32	+#define AFS_64BIT_ENV 1
33	+#define AFS_64BIT_CLIENT 1
34	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
35	+#define AFS_FBSD_ENV 1
36	+#define AFS_FBSD50_ENV 1
37	+#define AFS_FBSD51_ENV 1
38	+#define AFS_FBSD52_ENV 1
39	+#define AFS_FBSD53_ENV 1
40	+#define AFS_FBSD60_ENV 1
41	+#define AFS_FBSD61_ENV 1
42	+#define AFS_FBSD62_ENV 1
43	+#define AFS_FBSD70_ENV 1
44	+#define AFS_FBSD71_ENV 1
45	+#define AFS_FBSD80_ENV 1
46	+#define AFS_FBSD81_ENV 1
47	+#define AFS_FBSD90_ENV 1
48	+#define AFS_FBSD91_ENV 1
49	+#define AFS_FBSD92_ENV 1
50	+#define AFS_FBSD93_ENV 1
51	+#define AFS_X86_FBSD_ENV 1
52	+#define AFS_X86_FBSD50_ENV 1
53	+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
54	+#define AFS_X86_FBSD62_ENV 1
55	+#define AFS_X86_FBSD70_ENV 1
56	+#define AFS_X86_FBSD71_ENV 1
57	+#define AFS_X86_FBSD80_ENV 1
58	+#define AFS_X86_FBSD81_ENV 1
59	+#define AFS_X86_FBSD90_ENV 1
60	+#define AFS_X86_FBSD91_ENV 1
61	+#define AFS_X86_FBSD92_ENV 1
62	+#define AFS_X86_FBSD93_ENV 1
63	+#define AFS_X86_ENV 1
64	+#undef AFS_NONFSTRANS
65	+#define AFS_NONFSTRANS 1
66	+#define FTRUNC O_TRUNC
67	+
68	+#define IUPD 0x0010
69	+#define IACC 0x0020
70	+#define ICHG 0x0040
71	+#define IMOD 0x0080
72	+
73	+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
74	+ NULL, curproc)
75	+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
76	+ NULL, curproc)
77	+
78	+#include <afs/afs_sysnames.h>
79	+
80	+#define AFS_VFS_ENV 1
81	+#define AFS_VFSINCL_ENV 1
82	+#define AFS_GREEDY43_ENV 1
83	+#define AFS_ENV 1
84	+
85	+#define AFS_SYSCALL 339
86	+#define AFS_MOUNT_AFS "afs"
87	+
88	+#ifndef MOUNT_UFS
89	+#define MOUNT_UFS "ufs"
90	+#endif
91	+
92	+#ifndef MOUNT_AFS
93	+#define MOUNT_AFS AFS_MOUNT_AFS
94	+#endif
95	+
96	+#define RXK_LISTENER_ENV 1
97	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
98	+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
99	+
100	+/* Extra kernel definitions (from kdefs file) */
101	+#ifdef _KERNEL
102	+#define AFS_GLOBAL_SUNLOCK 1
103	+#define AFS_VFS34 1 /* What is VFS34??? */
104	+#define AFS_SHORTGID 0 /* are group id's short? */
105	+#define afsio_iov uio_iov
106	+#define afsio_iovcnt uio_iovcnt
107	+#define afsio_offset uio_offset
108	+#define afsio_seg uio_segflg
109	+#define afsio_resid uio_resid
110	+#define AFS_UIOSYS UIO_SYSSPACE
111	+#define AFS_UIOUSER UIO_USERSPACE
112	+#define AFS_CLBYTES CLBYTES
113	+#define osi_GetTime(x) microtime(x)
114	+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
115	+#undef AFS_KALLOC_NOSLEEP
116	+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
117	+#define AFS_KFREE(x,y) osi_fbsd_free((x))
118	+#define v_count v_usecount
119	+#define v_vfsp v_mount
120	+#define vfs_bsize mnt_stat.f_bsize
121	+#define vfs_fsid mnt_stat.f_fsid
122	+#define va_nodeid va_fileid
123	+#define vfs_vnodecovered mnt_vnodecovered
124	+#define direct dirent
125	+#define vnode_t struct vnode
126	+
127	+#ifndef MUTEX_DEFAULT
128	+#define MUTEX_DEFAULT 0
129	+#endif /* MUTEX_DEFAULT */
130	+
131	+#ifndef SSYS
132	+#define SSYS 0x00002
133	+#endif /* SSYS */
134	+
135	+#define p_rcred p_ucred
136	+
137	+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
138	+enum vcexcl { NONEXCL, EXCL };
139	+
140	+#ifdef KERNEL
141	+#ifndef MIN
142	+#define MIN(A,B) ((A) < (B) ? (A) : (B))
143	+#endif
144	+#ifndef MAX
145	+#define MAX(A,B) ((A) > (B) ? (A) : (B))
146	+#endif
147	+#endif /* KERNEL */
148	+
149	+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
150	+#endif /* _KERNEL */
151	+
152	+#else /* !defined(UKERNEL) */
153	+
154	+/* This section for user space compiles only */
155	+
156	+#define UKERNEL 1 /* user space kernel */
157	+#define AFS_ENV 1
158	+#define AFS_VFSINCL_ENV 1
159	+#define AFS_USR_FBSD50_ENV 1
160	+#define AFS_USR_FBSD51_ENV 1
161	+#define AFS_USR_FBSD52_ENV 1
162	+#define AFS_USR_FBSD53_ENV 1
163	+#define AFS_USR_FBSD60_ENV 1
164	+#define AFS_USR_FBSD61_ENV 1
165	+#define AFS_USR_FBSD70_ENV 1
166	+#define AFS_USR_FBSD71_ENV 1
167	+#define AFS_USR_FBSD80_ENV 1
168	+#define AFS_USR_FBSD81_ENV 1
169	+#define AFS_USR_FBSD90_ENV 1
170	+#define AFS_USR_FBSD91_ENV 1
171	+#define AFS_USR_FBSD92_ENV 1
172	+#define AFS_USR_FBSD93_ENV 1
173	+#define AFS_USR_FBSD_ENV 1
174	+#undef AFS_NONFSTRANS
175	+#define AFS_NONFSTRANS 1
176	+
177	+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
178	+#define AFS_SYSCALL 339
179	+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
180	+#define AFS_64BIT_ENV 1
181	+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
182	+#define AFS_USERSPACE_IP_ADDR 1
183	+#define RXK_LISTENER_ENV 1
184	+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
185	+
186	+#include <afs/afs_sysnames.h>
187	+
188	+#define afsio_iov uio_iov
189	+#define afsio_iovcnt uio_iovcnt
190	+#define afsio_offset uio_offset
191	+#define afsio_seg uio_segflg
192	+#define afsio_fmode uio_fmode
193	+#define afsio_resid uio_resid
194	+#define AFS_UIOSYS 1
195	+#define AFS_UIOUSER UIO_USERSPACE
196	+#define AFS_CLBYTES MCLBYTES
197	+#define AFS_MINCHANGE 2
198	+#define VATTR_NULL usr_vattr_null
199	+
200	+#define AFS_DIRENT
201	+#ifndef CMSERVERPREF
202	+#define CMSERVERPREF
203	+#endif
204	+
205	+#include <sys/param.h>
206	+#include <sys/types.h>
207	+#include <sys/mount.h>
208	+#include <sys/fcntl.h>
209	+#include <sys/uio.h>
210	+#include <sys/socket.h>
211	+#include <netinet/in.h>
212	+#include <limits.h>
213	+
214	+#endif /* !defined(UKERNEL) */
215	+
216	+/* general user-space compiles */
217	+
218	+#if defined(UKERNEL) \|\| !defined(KERNEL)
219	+#define STDLIB_HAS_MALLOC_PROTOS 1
220	+#endif
221	+
222	+#endif /* AFS_PARAM_H */