From ed2f4f8d3d92761d38b1ebfba8187e5e02745be1 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Sun, 16 May 2010 00:43:35 -0400 Subject: [PATCH] Kill FBSD4X with fire We haven't even pretended to work on the 4.X series for quite some time, and keeping this code around just makes things (slightly) harder to read. AFS_FBSD_ENV is now equivalent to AFS_FBSD50_ENV (though the latter should not be used). Leave the fbsd_4 sysnames in afs_sysnames.h for archival purposes. Change-Id: Ibebda92967ca26c3dd4bf0b2cc6a66ae3a94d0ff Reviewed-on: http://gerrit.openafs.org/1968 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- README | 12 +- acinclude.m4 | 3 - src/afs/FBSD/osi_file.c | 4 - src/afs/FBSD/osi_groups.c | 2 - src/afs/FBSD/osi_inode.c | 14 --- src/afs/FBSD/osi_machdep.h | 3 +- src/afs/FBSD/osi_misc.c | 28 ----- src/afs/FBSD/osi_vcache.c | 4 +- src/afs/FBSD/osi_vfsops.c | 9 -- src/afs/FBSD/osi_vnodeops.c | 41 +----- src/afs/VNOPS/afs_vnop_read.c | 2 +- src/afs/VNOPS/afs_vnop_strategy.c | 6 +- src/afs/VNOPS/afs_vnop_write.c | 2 +- src/afs/afs_init.c | 8 +- src/afs/afs_osi.c | 10 +- src/afs/afs_osi.h | 4 +- src/afs/afs_osidnlc.c | 2 +- src/afs/afs_pioctl.c | 14 +-- src/afs/afs_syscall.c | 2 +- src/afs/afs_user.c | 2 +- src/afs/afs_vcache.c | 9 +- src/afs/sysincludes.h | 14 +-- src/config/param.amd64_fbsd_53.h | 19 --- src/config/param.amd64_fbsd_70.h | 19 --- src/config/param.amd64_fbsd_71.h | 19 --- src/config/param.amd64_fbsd_80.h | 19 --- src/config/param.amd64_fbsd_81.h | 19 --- src/config/param.amd64_fbsd_90.h | 19 --- src/config/param.i386_fbsd_42.h | 189 ---------------------------- src/config/param.i386_fbsd_43.h | 192 ---------------------------- src/config/param.i386_fbsd_44.h | 195 ---------------------------- src/config/param.i386_fbsd_45.h | 197 ----------------------------- src/config/param.i386_fbsd_46.h | 199 ----------------------------- src/config/param.i386_fbsd_47.h | 202 ------------------------------ src/config/param.i386_fbsd_50.h | 19 --- src/config/param.i386_fbsd_51.h | 19 --- src/config/param.i386_fbsd_52.h | 19 --- src/config/param.i386_fbsd_53.h | 19 --- src/config/param.i386_fbsd_60.h | 19 --- src/config/param.i386_fbsd_61.h | 19 --- src/config/param.i386_fbsd_62.h | 19 --- src/config/param.i386_fbsd_70.h | 19 --- src/config/param.i386_fbsd_71.h | 19 --- src/config/param.i386_fbsd_80.h | 19 --- src/config/param.i386_fbsd_81.h | 19 --- src/config/param.i386_fbsd_90.h | 19 --- src/libafs/MakefileProto.FBSD.in | 20 +-- src/libuafs/MakefileProto.FBSD.in | 2 +- src/rx/FBSD/rx_kmutex.h | 70 +---------- src/rx/FBSD/rx_knet.c | 18 --- src/rx/rx_kcommon.c | 10 +- src/rx/rx_kcommon.h | 2 - 52 files changed, 43 insertions(+), 1790 deletions(-) delete mode 100644 src/config/param.i386_fbsd_42.h delete mode 100644 src/config/param.i386_fbsd_43.h delete mode 100644 src/config/param.i386_fbsd_44.h delete mode 100644 src/config/param.i386_fbsd_45.h delete mode 100644 src/config/param.i386_fbsd_46.h delete mode 100644 src/config/param.i386_fbsd_47.h diff --git a/README b/README index 350aaed05..19fd2f24e 100644 --- a/README +++ b/README @@ -40,11 +40,13 @@ A Configuring hp_ux11i, hp_ux110, hp_ux1123 (See notes below for information on getting missing header) hp_ux102 (Client port possible, but db servers and utilities work) - i386_fbsd_42, i386_fbsd_43, i386_fbsd_44, i386_fbsd_45, - i386_fbsd_46, i386_fbsd_47, i386_fbsd_50, i386_fbsd_51, - i386_fbsd_52, i386_fbsd_53, i386_fbsd_60, i386_fbsd_61, - i386_fbsd_62, i386_fbsd_70, i386_fbsd_80 - (client may work on 70) + i386_fbsd_50, i386_fbsd_51, i386_fbsd_52, i386_fbsd_53, + i386_fbsd_60, i386_fbsd_61, i386_fbsd_62, i386_fbsd_70, + i386_fbsd_80, i386_fbsd_81, i386_fbsd_90, amd64_fbsd_50, + amd64_fbsd_51, amd64_fbsd_52, amd64_fbsd_53, amd64_fbsd_60, + amd64_fbsd_61, amd64_fbsd_62, amd64_fbsd_70, amd64_fbsd_80, + amd64_fbsd_81, amd64_fbsd_90 + (client may work on 70 and later) i386_linux22, i386_linux24, i386_linux26 i386_nbsd15, i386_nbsd16, i386_nbsd20, i386_nbsd21, i386_nbsd30, i386_nbsd40 diff --git a/acinclude.m4 b/acinclude.m4 index 2dcc7c243..2379bfa20 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1087,9 +1087,6 @@ if test "x$with_bsd_kernel_build" != "x"; then BSD_KERNEL_BUILD="$with_bsd_kernel_build" else case $AFS_SYSNAME in - *_fbsd_4?) - BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC" - ;; *_fbsd_*) BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/${HOST_CPU}/compile/GENERIC" ;; diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c index 4b38d70fb..394a45ccc 100644 --- a/src/afs/FBSD/osi_file.c +++ b/src/afs/FBSD/osi_file.c @@ -38,11 +38,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) osi_Panic("UFSOpen called for non-UFS cache\n"); afile = (struct osi_file *)osi_AllocSmallSpace(sizeof(struct osi_file)); AFS_GUNLOCK(); -#if defined(AFS_FBSD50_ENV) code = VFS_VGET(afs_cacheVfsp, (ino_t) ainode->ufs, LK_EXCLUSIVE, &vp); -#else - code = VFS_VGET(afs_cacheVfsp, (ino_t) ainode->ufs, &vp); -#endif AFS_GLOCK(); if (code == 0 && vp->v_type == VNON) code = ENOENT; diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c index 3c54d279d..ef6247824 100644 --- a/src/afs/FBSD/osi_groups.c +++ b/src/afs/FBSD/osi_groups.c @@ -17,9 +17,7 @@ #include #include "afs/param.h" #include -#ifdef AFS_FBSD50_ENV #include -#endif #include "afs/sysincludes.h" diff --git a/src/afs/FBSD/osi_inode.c b/src/afs/FBSD/osi_inode.c index cf73f67b2..51078940f 100644 --- a/src/afs/FBSD/osi_inode.c +++ b/src/afs/FBSD/osi_inode.c @@ -24,9 +24,7 @@ #include #include #include -#if defined(AFS_FBSD50_ENV) #include -#endif #include int @@ -50,11 +48,7 @@ getinode(fs, dev, inode, ipp, perror) register struct ufsmount *ump; register struct mount *mp; -#if defined(AFS_FBSD50_ENV) mtx_lock(&mountlist_mtx); -#else - simple_lock(&mountlist_slock); -#endif if ((mp = TAILQ_FIRST(&mountlist)) != NULL) do { /* @@ -72,19 +66,11 @@ getinode(fs, dev, inode, ipp, perror) } mp = TAILQ_NEXT(mp, mnt_list); } while (mp != TAILQ_FIRST(&mountlist)); -#if defined(AFS_FBSD50_ENV) mtx_unlock(&mountlist_mtx); -#else - simple_unlock(&mountlist_slock); -#endif if (!fs) return (ENXIO); } -#if defined(AFS_FBSD50_ENV) code = VFS_VGET(fs, inode, 0, &vp); -#else - code = VFS_VGET(fs, inode, &vp); -#endif if (code != 0) { *perror = BAD_IGET; return code; diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h index eddb35b28..15cea310b 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -21,9 +21,7 @@ #include #include -#if defined(AFS_FBSD50_ENV) #include -#endif #include #if defined(AFS_FBSD80_ENV) #include @@ -66,6 +64,7 @@ extern int (**afs_vnodeop_p) (); #else #define osi_vinvalbuf(vp, flags, slpflag, slptimeo) \ vinvalbuf((vp), (flags), (curthread), (slpflag), (slptimeo)) +#define osi_curproc() (curthread) #endif #undef gop_lookupname diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c index e433602e1..6c2876d62 100644 --- a/src/afs/FBSD/osi_misc.c +++ b/src/afs/FBSD/osi_misc.c @@ -27,11 +27,9 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink, struct nameidata n; int flags, error, glocked; -#ifdef AFS_FBSD50_ENV glocked = ISAFS_GLOCK(); if (glocked) AFS_GUNLOCK(); -#endif flags = 0; flags = LOCKLEAF; @@ -44,10 +42,8 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink, #endif NDINIT(&n, LOOKUP, flags, seg, aname, curthread); if ((error = namei(&n)) != 0) { -#ifdef AFS_FBSD50_ENV if (glocked) AFS_GLOCK(); -#endif return error; } *vpp = n.ni_vp; @@ -58,10 +54,8 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink, VOP_UNLOCK(n.ni_vp, 0, curthread); #endif NDFREE(&n, NDF_ONLY_PNBUF); -#ifdef AFS_FBSD50_ENV if (glocked) AFS_GLOCK(); -#endif return 0; } @@ -71,27 +65,7 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink, void afs_osi_SetTime(osi_timeval_t * atv) { -#ifdef AFS_FBSD50_ENV printf("afs attempted to set clock; use \"afsd -nosettime\"\n"); -#else - struct timespec ts; - struct timeval tv, delta; - int s; - - AFS_GUNLOCK(); - s = splclock(); - microtime(&tv); - delta = *atv; - timevalsub(&delta, &tv); - ts.tv_sec = atv->tv_sec; - ts.tv_nsec = atv->tv_usec * 1000; - set_timecounter(&ts); - (void)splsoftclock(); - lease_updatetime(delta.tv_sec); - splx(s); - resettodr(); - AFS_GLOCK(); -#endif } /* @@ -101,7 +75,6 @@ void * osi_fbsd_alloc(size_t size, int dropglobal) { void *rv; -#ifdef AFS_FBSD50_ENV int glocked; if (dropglobal) { @@ -112,7 +85,6 @@ osi_fbsd_alloc(size_t size, int dropglobal) if (glocked) AFS_GLOCK(); } else -#endif rv = malloc(size, M_AFS, M_NOWAIT); return (rv); diff --git a/src/afs/FBSD/osi_vcache.c b/src/afs/FBSD/osi_vcache.c index 9d6e2aa86..dd295f2ec 100644 --- a/src/afs/FBSD/osi_vcache.c +++ b/src/afs/FBSD/osi_vcache.c @@ -70,10 +70,8 @@ osi_AttachVnode(struct vcache *avc, int seq) { AFS_GUNLOCK(); #if defined(AFS_FBSD60_ENV) if (getnewvnode(MOUNT_AFS, afs_globalVFS, &afs_vnodeops, &vp)) -#elif defined(AFS_FBSD50_ENV) - if (getnewvnode(MOUNT_AFS, afs_globalVFS, afs_vnodeop_p, &vp)) #else - if (getnewvnode(VT_AFS, afs_globalVFS, afs_vnodeop_p, &vp)) + if (getnewvnode(MOUNT_AFS, afs_globalVFS, afs_vnodeop_p, &vp)) #endif panic("afs getnewvnode"); /* can't happen */ #ifdef AFS_FBSD70_ENV diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index 83d6ce521..82875cf1e 100644 --- a/src/afs/FBSD/osi_vfsops.c +++ b/src/afs/FBSD/osi_vfsops.c @@ -224,22 +224,15 @@ tryagain: if (tvp) { struct vnode *vp = AFSTOV(tvp); -#ifdef AFS_FBSD50_ENV ASSERT_VI_UNLOCKED(vp, "afs_root"); -#endif AFS_GUNLOCK(); /* * I'm uncomfortable about this. Shouldn't this happen at a * higher level, and shouldn't we busy the top-level directory * to prevent recycling? */ -#ifdef AFS_FBSD50_ENV error = vget(vp, LK_EXCLUSIVE | LK_RETRY, td); vp->v_vflag |= VV_ROOT; -#else - error = vget(vp, LK_EXCLUSIVE | LK_RETRY, p); - vp->v_flag |= VROOT; -#endif AFS_GLOCK(); if (error != 0) goto tryagain; @@ -332,8 +325,6 @@ struct vfsops afs_vfsops = { afs_init, afs_uninit, vfs_stdextattrctl, -#ifdef AFS_FBSD50_ENV vfs_stdsysctl, -#endif }; #endif diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c index 6dca7f413..779f4dc16 100644 --- a/src/afs/FBSD/osi_vnodeops.c +++ b/src/afs/FBSD/osi_vnodeops.c @@ -54,9 +54,6 @@ #include #include #include -#ifndef AFS_FBSD50_ENV -#include -#endif #include #include #include @@ -158,9 +155,6 @@ int afs_vop_putpages(struct vop_putpages_args *); int afs_vop_ioctl(struct vop_ioctl_args *); static int afs_vop_pathconf(struct vop_pathconf_args *); int afs_vop_poll(struct vop_poll_args *); -#ifndef AFS_FBSD50_ENV -int afs_vop_mmap(struct vop_mmap_args *); -#endif int afs_vop_fsync(struct vop_fsync_args *); int afs_vop_remove(struct vop_remove_args *); int afs_vop_link(struct vop_link_args *); @@ -186,9 +180,6 @@ struct vnodeopv_entry_desc afs_vnodeop_entries[] = { {&vop_access_desc, (vop_t *) afs_vop_access}, /* access */ {&vop_advlock_desc, (vop_t *) afs_vop_advlock}, /* advlock */ {&vop_bmap_desc, (vop_t *) afs_vop_bmap}, /* bmap */ -#ifndef AFS_FBSD50_ENV - {&vop_bwrite_desc, (vop_t *) vop_stdbwrite}, -#endif {&vop_close_desc, (vop_t *) afs_vop_close}, /* close */ {&vop_createvobject_desc, (vop_t *) vop_stdcreatevobject}, {&vop_destroyvobject_desc, (vop_t *) vop_stddestroyvobject}, @@ -204,9 +195,6 @@ struct vnodeopv_entry_desc afs_vnodeop_entries[] = { {&vop_lookup_desc, (vop_t *) afs_vop_lookup}, /* lookup */ {&vop_mkdir_desc, (vop_t *) afs_vop_mkdir}, /* mkdir */ {&vop_mknod_desc, (vop_t *) afs_vop_mknod}, /* mknod */ -#ifndef AFS_FBSD50_ENV - {&vop_mmap_desc, (vop_t *) afs_vop_mmap}, /* mmap */ -#endif {&vop_open_desc, (vop_t *) afs_vop_open}, /* open */ {&vop_pathconf_desc, (vop_t *) afs_vop_pathconf}, /* pathconf */ {&vop_poll_desc, (vop_t *) afs_vop_poll}, /* select */ @@ -244,11 +232,6 @@ struct vnodeopv_desc afs_vnodeop_opv_desc = #define DROPNAME() FREE(name, M_TEMP) -/* This is a bit of a cheat... */ -#ifdef AFS_FBSD50_ENV -#define a_p a_td -#endif - #if defined(AFS_FBSD80_ENV) #define ma_vn_lock(vp, flags, p) (vn_lock(vp, flags)) #define MA_VOP_LOCK(vp, flags, p) (VOP_LOCK(vp, flags)) @@ -761,9 +744,7 @@ afs_vop_getpages(struct vop_getpages_args *ap) struct vnode *vp; struct vcache *avc; -#ifdef AFS_FBSD50_ENV GIANT_REQUIRED; -#endif vp = ap->a_vp; avc = VTOAFS(vp); if ((object = vp->v_object) == NULL) { @@ -780,10 +761,8 @@ afs_vop_getpages(struct vop_getpages_args *ap) { vm_page_t m = ap->a_m[ap->a_reqpage]; -#ifdef AFS_FBSD50_ENV VM_OBJECT_LOCK(object); vm_page_lock_queues(); -#endif if (m->valid != 0) { /* handled by vm_fault now */ /* vm_page_zero_invalid(m, TRUE); */ @@ -791,25 +770,19 @@ afs_vop_getpages(struct vop_getpages_args *ap) if (i != ap->a_reqpage) vm_page_free(ap->a_m[i]); } -#ifdef AFS_FBSD50_ENV vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); -#endif return (0); } -#ifdef AFS_FBSD50_ENV vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); -#endif } bp = getpbuf(&afs_pbuf_freecnt); kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, ap->a_m, npages); -#ifdef AFS_FBSD50_ENV cnt.v_vnodein++; cnt.v_vnodepgsin += npages; -#endif iov.iov_base = (caddr_t) kva; iov.iov_len = ap->a_count; @@ -830,26 +803,20 @@ afs_vop_getpages(struct vop_getpages_args *ap) relpbuf(bp, &afs_pbuf_freecnt); if (code && (uio.uio_resid == ap->a_count)) { -#ifdef AFS_FBSD50_ENV VM_OBJECT_LOCK(object); vm_page_lock_queues(); -#endif for (i = 0; i < npages; ++i) { if (i != ap->a_reqpage) vm_page_free(ap->a_m[i]); } -#ifdef AFS_FBSD50_ENV vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); -#endif return VM_PAGER_ERROR; } size = ap->a_count - uio.uio_resid; -#ifdef AFS_FBSD50_ENV VM_OBJECT_LOCK(object); vm_page_lock_queues(); -#endif for (i = 0, toff = 0; i < npages; i++, toff = nextoff) { vm_page_t m; nextoff = toff + PAGE_SIZE; @@ -901,10 +868,8 @@ afs_vop_getpages(struct vop_getpages_args *ap) } } } -#ifdef AFS_FBSD50_ENV vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); -#endif return 0; } @@ -953,9 +918,7 @@ afs_vop_putpages(struct vop_putpages_args *ap) struct vnode *vp; struct vcache *avc; -#ifdef AFS_FBSD50_ENV GIANT_REQUIRED; -#endif vp = ap->a_vp; avc = VTOAFS(vp); @@ -975,10 +938,8 @@ afs_vop_putpages(struct vop_putpages_args *ap) kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, ap->a_m, npages); -#ifdef AFS_FBSD50_ENV cnt.v_vnodeout++; cnt.v_vnodepgsout += ap->a_count; -#endif iov.iov_base = (caddr_t) kva; iov.iov_len = ap->a_count; @@ -1441,7 +1402,7 @@ afs_vop_inactive(ap) afs_InactiveVCache(VTOAFS(vp), 0); /* decrs ref counts */ AFS_GUNLOCK(); #ifndef AFS_FBSD80_ENV - MA_VOP_UNLOCK(vp, 0, ap->a_p); + MA_VOP_UNLOCK(vp, 0, ap->a_td); #endif return 0; } diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c index 6b5b509c2..58212434f 100644 --- a/src/afs/VNOPS/afs_vnop_read.c +++ b/src/afs/VNOPS/afs_vnop_read.c @@ -883,7 +883,7 @@ afs_UFSRead(register struct vcache *avc, struct uio *auio, code = VOP_READ(tfile->vnode, &tuio, 0, afs_osi_credp); VOP_UNLOCK(tfile->vnode, 0); AFS_GLOCK(); -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) AFS_GUNLOCK(); VOP_LOCK(tfile->vnode, LK_EXCLUSIVE, curthread); code = VOP_READ(tfile->vnode, &tuio, 0, afs_osi_credp); diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c index a79e52a53..d860352cc 100644 --- a/src/afs/VNOPS/afs_vnop_strategy.c +++ b/src/afs/VNOPS/afs_vnop_strategy.c @@ -61,7 +61,7 @@ int afs_ustrategy(register struct buf *abp) ReleaseReadLock(&tvc->lock); osi_Assert(credp); #endif -#ifdef AFS_FBSD50_ENV +#ifdef AFS_FBSD_ENV if (abp->b_iocmd == BIO_READ) { #else if ((abp->b_flags & B_READ) == B_READ) { @@ -190,7 +190,7 @@ int afs_ustrategy(register struct buf *abp) #if defined (AFS_XBSD_ENV) if (code) { abp->b_error = code; -#if !defined(AFS_FBSD50_ENV) +#if !defined(AFS_FBSD_ENV) abp->b_flags |= B_ERROR; #endif } @@ -200,7 +200,7 @@ int afs_ustrategy(register struct buf *abp) crfree(credp); #elif defined(AFS_FBSD60_ENV) (*abp->b_iodone)(abp); -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) biodone(&abp->b_io); #elif defined(AFS_XBSD_ENV) biodone(abp); diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c index da3ca8e11..c12c3277c 100644 --- a/src/afs/VNOPS/afs_vnop_write.c +++ b/src/afs/VNOPS/afs_vnop_write.c @@ -510,7 +510,7 @@ afs_UFSWrite(register struct vcache *avc, struct uio *auio, int aio, code = VOP_WRITE(tfile->vnode, &tuio, 0, afs_osi_credp); VOP_UNLOCK(tfile->vnode, 0); AFS_GLOCK(); -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) AFS_GUNLOCK(); VOP_LOCK(tfile->vnode, LK_EXCLUSIVE, curthread); code = VOP_WRITE(tfile->vnode, &tuio, 0, afs_osi_credp); diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c index 9ca08e319..b247bb64f 100644 --- a/src/afs/afs_init.c +++ b/src/afs/afs_init.c @@ -421,14 +421,10 @@ afs_InitCacheInfo(register char *afile) #elif defined(AFS_DARWIN80_ENV) afs_cacheVfsp = vnode_mount(filevp); if (afs_cacheVfsp && ((st = *(vfs_statfs(afs_cacheVfsp))),1)) -#elif defined(AFS_DARWIN_ENV) - if (!VFS_STATFS(filevp->v_mount, &st, current_proc())) #elif defined(AFS_FBSD80_ENV) if (!VFS_STATFS(filevp->v_mount, &st)) -#elif defined(AFS_FBSD50_ENV) - if (!VFS_STATFS(filevp->v_mount, &st, curthread)) -#elif defined(AFS_XBSD_ENV) - if (!VFS_STATFS(filevp->v_mount, &st, curproc)) +#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) + if (!VFS_STATFS(filevp->v_mount, &st, osi_curproc())) #else if (!VFS_STATFS(filevp->v_vfsp, &st)) #endif /* SGI... */ diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index e482a6396..ed018bc94 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -45,6 +45,7 @@ long afs_global_owner; #endif #if defined(AFS_DARWIN_ENV) +thread_t afs_global_owner; #ifdef AFS_DARWIN80_ENV lck_mtx_t *afs_global_lock; #else @@ -52,19 +53,14 @@ struct lock__bsd__ afs_global_lock; #endif #endif -#if defined(AFS_XBSD_ENV) && !defined(AFS_FBSD50_ENV) +#if defined(AFS_XBSD_ENV) && !defined(AFS_FBSD_ENV) struct lock afs_global_lock; afs_proc_t *afs_global_owner; -#endif -#ifdef AFS_FBSD50_ENV +#elif defined(AFS_FBSD_ENV) struct mtx afs_global_mtx; struct thread *afs_global_owner; #endif -#if defined(AFS_DARWIN_ENV) -thread_t afs_global_owner; -#endif /* AFS_DARWIN_ENV */ - #if defined(AFS_AIX41_ENV) simple_lock_data afs_global_lock; #endif diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index ba5e84bb8..916a65693 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -13,7 +13,7 @@ #include "h/types.h" #include "h/param.h" -#ifdef AFS_FBSD50_ENV +#ifdef AFS_FBSD_ENV #include #endif @@ -194,7 +194,7 @@ typedef struct timeval osi_timeval_t; * is going on in the system. So if ps cannot show thread IDs it is * likely to be the process ID instead. */ -#ifdef AFS_FBSD50_ENV +#ifdef AFS_FBSD_ENV /* should use curthread, but 'ps' can't display it */ #define osi_ThreadUnique() (curproc->p_pid) #elif defined(AFS_LINUX_ENV) diff --git a/src/afs/afs_osidnlc.c b/src/afs/afs_osidnlc.c index 83bc79307..880702d74 100644 --- a/src/afs/afs_osidnlc.c +++ b/src/afs/afs_osidnlc.c @@ -285,7 +285,7 @@ osi_dnlc_lookup(struct vcache *adp, char *aname, int locktype) ma_critical_exit(); return 0; } -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) /* can't sleep in a critical section */ ma_critical_exit(); osi_vnhold(tvc, 0); diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 0e170d959..57555d624 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -15,7 +15,7 @@ #ifdef AFS_OBSD_ENV #include "h/syscallargs.h" #endif -#ifdef AFS_FBSD50_ENV +#ifdef AFS_FBSD_ENV #include "h/sysproto.h" #endif #ifdef AFS_NBSD40_ENV @@ -798,7 +798,7 @@ afs_xioctl(afs_proc_t *p, register struct ioctl_args *uap, register_t *retval) return (code); } #elif defined(AFS_XBSD_ENV) -# if defined(AFS_FBSD50_ENV) +# if defined(AFS_FBSD_ENV) # define arg data int afs_xioctl(struct thread *td, register struct ioctl_args *uap, @@ -863,10 +863,8 @@ afs_xioctl(afs_proc_t *p, register struct ioctl_args *uap, register_t *retval) } if (!ioctlDone) { -# if defined(AFS_FBSD50_ENV) +# if defined(AFS_FBSD_ENV) return ioctl(td, uap); -# elif defined(AFS_FBSD_ENV) - return ioctl(p, uap); # elif defined(AFS_OBSD_ENV) code = sys_ioctl(p, uap, retval); # elif defined(AFS_NBSD_ENV) @@ -953,7 +951,7 @@ afs_pioctl(struct pioctlargs *uap, rval_t * rvp) # endif } -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) int afs_pioctl(struct thread *td, void *args, int *retval) { @@ -971,11 +969,7 @@ afs_pioctl(struct thread *td, void *args, int *retval) #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int -# if defined(AFS_FBSD_ENV) -afs_pioctl(struct thread *td, void *args) -# else afs_pioctl(afs_proc_t *p, void *args, int *retval) -# endif { struct a { char *path; diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c index 1236b2db2..b6425fac6 100644 --- a/src/afs/afs_syscall.c +++ b/src/afs/afs_syscall.c @@ -738,7 +738,7 @@ Afs_syscall() code = afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, rvp, CRED()); -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) code = afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, p->td_ucred); diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index 2bfac9b27..fc09636ba 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -639,7 +639,7 @@ afs_GCPAGs_perproc_func(afs_proc_t * pproc) afs_GCPAGs_cred_count++; pag = PagInCred(pcred); -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV) || defined(AFS_LINUX22_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_LINUX22_ENV) uid = (pag != NOPAG ? pag : afs_cr_uid(pcred)); #elif defined(AFS_SUN510_ENV) uid = (pag != NOPAG ? pag : crgetruid(pcred)); diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 9365aa5c3..f564d1914 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -1647,20 +1647,13 @@ afs_GetVCache(register struct VenusFid *afid, struct vrequest *areq, vinvalbuf(vp, V_SAVE, curthread, PINOD, 0); if (!iheldthelock) VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread); -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) iheldthelock = VOP_ISLOCKED(vp, curthread); if (!iheldthelock) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); vinvalbuf(vp, V_SAVE, osi_curcred(), curthread, PINOD, 0); if (!iheldthelock) VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread); -#elif defined(AFS_FBSD40_ENV) - iheldthelock = VOP_ISLOCKED(vp, curproc); - if (!iheldthelock) - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curproc); - vinvalbuf(vp, V_SAVE, osi_curcred(), curproc, PINOD, 0); - if (!iheldthelock) - VOP_UNLOCK(vp, LK_EXCLUSIVE, curproc); #elif defined(AFS_OBSD_ENV) iheldthelock = VOP_ISLOCKED(vp, curproc); if (!iheldthelock) diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 32e2848d5..71bfbcffb 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -313,7 +313,7 @@ typedef unsigned short etap_event_t; # include "h/user.h" # endif /* AFS_SGI64_ENV */ # define MACH_USER_API 1 -# if defined(AFS_FBSD50_ENV) +# if defined(AFS_FBSD_ENV) # include "h/bio.h" # include "h/filedesc.h" # endif @@ -340,7 +340,7 @@ struct vfspage; /* for vnode.h compiler warnings */ # endif # endif /* AFS_HPUX_ENV */ # if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) -# if defined(AFS_FBSD50_ENV) +# if defined(AFS_FBSD_ENV) struct vop_getwritemount_args; # endif # include @@ -355,11 +355,7 @@ struct vop_getwritemount_args; # ifndef AFS_NBSD40_ENV # include # endif -# ifndef AFS_FBSD_ENV -# include -# define timeout_fcn_t mach_timeout_fcn_t -# include -# else +# ifdef AFS_FBSD_ENV MALLOC_DECLARE(M_AFS); # include # include @@ -368,6 +364,10 @@ MALLOC_DECLARE(M_AFS); # include # include # include +# else +# include +# define timeout_fcn_t mach_timeout_fcn_t +# include # endif # undef timeout_fcn_t # define _DIR_H_ diff --git a/src/config/param.amd64_fbsd_53.h b/src/config/param.amd64_fbsd_53.h index 7ebc01f23..a9897bbef 100644 --- a/src/config/param.amd64_fbsd_53.h +++ b/src/config/param.amd64_fbsd_53.h @@ -16,23 +16,11 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_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_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -138,13 +126,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.amd64_fbsd_70.h b/src/config/param.amd64_fbsd_70.h index 602cbfe03..aa6370516 100644 --- a/src/config/param.amd64_fbsd_70.h +++ b/src/config/param.amd64_fbsd_70.h @@ -28,13 +28,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -44,11 +37,6 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -149,13 +137,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.amd64_fbsd_71.h b/src/config/param.amd64_fbsd_71.h index 3ae1b7bb9..e0e9d4064 100644 --- a/src/config/param.amd64_fbsd_71.h +++ b/src/config/param.amd64_fbsd_71.h @@ -28,13 +28,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -45,11 +38,6 @@ #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -151,13 +139,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.amd64_fbsd_80.h b/src/config/param.amd64_fbsd_80.h index ed0c4922a..1efb3508d 100644 --- a/src/config/param.amd64_fbsd_80.h +++ b/src/config/param.amd64_fbsd_80.h @@ -28,13 +28,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -46,11 +39,6 @@ #define AFS_FBSD71_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -153,13 +141,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.amd64_fbsd_81.h b/src/config/param.amd64_fbsd_81.h index 4d0b11aa0..1f4f49741 100644 --- a/src/config/param.amd64_fbsd_81.h +++ b/src/config/param.amd64_fbsd_81.h @@ -28,13 +28,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -47,11 +40,6 @@ #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -155,13 +143,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.amd64_fbsd_90.h b/src/config/param.amd64_fbsd_90.h index f1053e5c3..3e220c79c 100644 --- a/src/config/param.amd64_fbsd_90.h +++ b/src/config/param.amd64_fbsd_90.h @@ -28,13 +28,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -48,11 +41,6 @@ #define AFS_FBSD81_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -157,13 +145,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_42.h b/src/config/param.i386_fbsd_42.h deleted file mode 100644 index 82789b85d..000000000 --- a/src/config/param.i386_fbsd_42.h +++ /dev/null @@ -1,189 +0,0 @@ -#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_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define O_SYNC O_FSYNC -#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 210 -#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_42" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_42 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ - -#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 AFS_SHORTGID 1 /* 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 */ - -#endif /* AFS_PARAM_H */ - -#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_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define O_SYNC O_FSYNC - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#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 */ -#include - -#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_42" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_42 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't 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 /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_43.h b/src/config/param.i386_fbsd_43.h deleted file mode 100644 index b3ea04b00..000000000 --- a/src/config/param.i386_fbsd_43.h +++ /dev/null @@ -1,192 +0,0 @@ -#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_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define O_SYNC O_FSYNC -#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 210 -#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_43" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_43 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ - -#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 AFS_SHORTGID 1 /* 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 */ - -#endif /* AFS_PARAM_H */ - -#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_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define O_SYNC O_FSYNC - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#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 */ -#include - -#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_43" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_43 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't 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 /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_44.h b/src/config/param.i386_fbsd_44.h deleted file mode 100644 index aabbea056..000000000 --- a/src/config/param.i386_fbsd_44.h +++ /dev/null @@ -1,195 +0,0 @@ -#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_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD44_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define O_SYNC O_FSYNC -#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 210 -#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_44" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_44 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ - -#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 AFS_SHORTGID 1 /* 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 */ - -#endif /* AFS_PARAM_H */ - -#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_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define O_SYNC O_FSYNC - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#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 */ -#include - -#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_44" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_44 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't 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 /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_45.h b/src/config/param.i386_fbsd_45.h deleted file mode 100644 index 2b76f0374..000000000 --- a/src/config/param.i386_fbsd_45.h +++ /dev/null @@ -1,197 +0,0 @@ -#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_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD45_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define O_SYNC O_FSYNC -#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 210 -#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_45" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_45 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ - -#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 AFS_SHORTGID 1 /* 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 */ - -#endif /* AFS_PARAM_H */ - -#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_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define O_SYNC O_FSYNC - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#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 */ -#include - -#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_45" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_45 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't 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 /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_46.h b/src/config/param.i386_fbsd_46.h deleted file mode 100644 index 66686ff61..000000000 --- a/src/config/param.i386_fbsd_46.h +++ /dev/null @@ -1,199 +0,0 @@ -#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_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define O_SYNC O_FSYNC -#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 210 -#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_46" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_46 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ - -#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 AFS_SHORTGID 1 /* 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 */ - -#endif /* AFS_PARAM_H */ - -#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_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define O_SYNC O_FSYNC - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#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 */ -#include - -#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_46" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_46 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't 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 /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_47.h b/src/config/param.i386_fbsd_47.h deleted file mode 100644 index 1a5e9f268..000000000 --- a/src/config/param.i386_fbsd_47.h +++ /dev/null @@ -1,202 +0,0 @@ -#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_ENV 1 -#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ -#define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 -#define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 -#define AFS_X86_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 -#define O_SYNC O_FSYNC -#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 210 -#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_47" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_47 - -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ - -#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 AFS_SHORTGID 1 /* 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 */ - -#endif /* AFS_PARAM_H */ - -#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_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 -#define AFS_USR_FBSD_ENV 1 -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS 1 - -#define O_SYNC O_FSYNC - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 210 -#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 */ -#include - -#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_47" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_47 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't 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 /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_50.h b/src/config/param.i386_fbsd_50.h index 0bb4449f5..51af23cb4 100644 --- a/src/config/param.i386_fbsd_50.h +++ b/src/config/param.i386_fbsd_50.h @@ -16,20 +16,8 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -141,13 +129,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD_ENV 1 #undef AFS_NONFSTRANS diff --git a/src/config/param.i386_fbsd_51.h b/src/config/param.i386_fbsd_51.h index 41c315b4f..5eceb7d7a 100644 --- a/src/config/param.i386_fbsd_51.h +++ b/src/config/param.i386_fbsd_51.h @@ -16,21 +16,9 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -142,13 +130,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD_ENV 1 diff --git a/src/config/param.i386_fbsd_52.h b/src/config/param.i386_fbsd_52.h index 07e767369..44e6c7b30 100644 --- a/src/config/param.i386_fbsd_52.h +++ b/src/config/param.i386_fbsd_52.h @@ -16,22 +16,10 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_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_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -143,13 +131,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_53.h b/src/config/param.i386_fbsd_53.h index bc0439e91..7f62aeb5f 100644 --- a/src/config/param.i386_fbsd_53.h +++ b/src/config/param.i386_fbsd_53.h @@ -16,23 +16,11 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_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_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -138,13 +126,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_60.h b/src/config/param.i386_fbsd_60.h index 17c4ddee7..afa881001 100644 --- a/src/config/param.i386_fbsd_60.h +++ b/src/config/param.i386_fbsd_60.h @@ -16,24 +16,12 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_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_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -139,13 +127,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_61.h b/src/config/param.i386_fbsd_61.h index dfef61eae..ba8a3e36e 100644 --- a/src/config/param.i386_fbsd_61.h +++ b/src/config/param.i386_fbsd_61.h @@ -25,13 +25,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -39,11 +32,6 @@ #define AFS_FBSD60_ENV 1 #define AFS_FBSD61_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS @@ -141,13 +129,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_62.h b/src/config/param.i386_fbsd_62.h index c574fabd7..24090e122 100644 --- a/src/config/param.i386_fbsd_62.h +++ b/src/config/param.i386_fbsd_62.h @@ -26,13 +26,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -41,11 +34,6 @@ #define AFS_FBSD61_ENV 1 #define AFS_FBSD62_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 #define AFS_X86_FBSD62_ENV 1 @@ -145,13 +133,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_70.h b/src/config/param.i386_fbsd_70.h index b89ba2f72..b62475932 100644 --- a/src/config/param.i386_fbsd_70.h +++ b/src/config/param.i386_fbsd_70.h @@ -26,13 +26,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -42,11 +35,6 @@ #define AFS_FBSD62_ENV 1 #define AFS_FBSD70_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -147,13 +135,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_71.h b/src/config/param.i386_fbsd_71.h index bd195d5dd..7bd6b60aa 100644 --- a/src/config/param.i386_fbsd_71.h +++ b/src/config/param.i386_fbsd_71.h @@ -26,13 +26,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -43,11 +36,6 @@ #define AFS_FBSD70_ENV 1 #define AFS_FBSD71_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -149,13 +137,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_80.h b/src/config/param.i386_fbsd_80.h index 3afa735d4..002db22e6 100644 --- a/src/config/param.i386_fbsd_80.h +++ b/src/config/param.i386_fbsd_80.h @@ -26,13 +26,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -44,11 +37,6 @@ #define AFS_FBSD71_ENV 1 #define AFS_FBSD80_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -151,13 +139,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_81.h b/src/config/param.i386_fbsd_81.h index d95b6873e..cf62adc9e 100644 --- a/src/config/param.i386_fbsd_81.h +++ b/src/config/param.i386_fbsd_81.h @@ -26,13 +26,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -45,11 +38,6 @@ #define AFS_FBSD80_ENV 1 #define AFS_FBSD81_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -153,13 +141,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/config/param.i386_fbsd_90.h b/src/config/param.i386_fbsd_90.h index 082e7f5dc..28a38eb4f 100644 --- a/src/config/param.i386_fbsd_90.h +++ b/src/config/param.i386_fbsd_90.h @@ -26,13 +26,6 @@ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_FBSD_ENV 1 -#define AFS_FBSD40_ENV 1 -#define AFS_FBSD42_ENV 1 -#define AFS_FBSD43_ENV 1 -#define AFS_FBSD44_ENV 1 -#define AFS_FBSD45_ENV 1 -#define AFS_FBSD46_ENV 1 -#define AFS_FBSD47_ENV 1 #define AFS_FBSD50_ENV 1 #define AFS_FBSD51_ENV 1 #define AFS_FBSD52_ENV 1 @@ -46,11 +39,6 @@ #define AFS_FBSD81_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_X86_FBSD_ENV 1 -#define AFS_X86_FBSD40_ENV 1 -#define AFS_X86_FBSD42_ENV 1 -#define AFS_X86_FBSD43_ENV 1 -#define AFS_X86_FBSD46_ENV 1 -#define AFS_X86_FBSD47_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 @@ -155,13 +143,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_ENV 1 #define AFS_VFSINCL_ENV 1 -#define AFS_USR_FBSD40_ENV 1 -#define AFS_USR_FBSD42_ENV 1 -#define AFS_USR_FBSD43_ENV 1 -#define AFS_USR_FBSD44_ENV 1 -#define AFS_USR_FBSD45_ENV 1 -#define AFS_USR_FBSD46_ENV 1 -#define AFS_USR_FBSD47_ENV 1 #define AFS_USR_FBSD50_ENV 1 #define AFS_USR_FBSD51_ENV 1 #define AFS_USR_FBSD52_ENV 1 diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index a7a36d1aa..cce28dc03 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -42,18 +42,11 @@ KOPTS = -fPIC KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \ -elf \ - - -mpreferred-stack-boundary=2 \ - -fformat-extensions \ - -include ${KBLD}/opt_global.h \ - - -include ${KBLD}/opt_global.h -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \ - + -mno-align-long-strings -fno-common -ffreestanding \ -I${KBLD} -include opt_global.h -fno-strict-aliasing - DBUG = -O2 #DBUG = -O -g @@ -127,17 +120,10 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS) $(LD) -Bshareable -o ${LIBAFS} setdef0.o ${LIBAFS}.kld setdef1.o ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) - - $(LD) -r -o libafs.kld ${AFSAOBJS} ${AFSNONFSOBJS} - gensetdefs libafs.kld - $(MAKE) setdef0.o setdef1.o - $(LD) -Bshareable -o ${LIBAFSNONFS} setdef0.o libafs.kld setdef1.o - $(LD) -r -d -warn-common -o libafs.kld ${AFSAOBJS} ${AFSNONFSOBJS} touch export_syms awk -f ${KSRC}/conf/kmod_syms.awk libafs.kld export_syms | xargs -J% objcopy % libafs.kld $(LD) -Bshareable -d -warn-common -o ${LIBAFSNONFS} libafs.kld - # Object build rules: @@ -147,10 +133,6 @@ setdef1.o: setdef1.c $(CRULE_NOOPT) # vnode_if.h build rules: - -vnode_if.h: ${KSRC}/kern/vnode_if.src - perl5 ${KSRC}/kern/vnode_if.pl -h ${KSRC}/kern/vnode_if.src - vnode_if.h: ${KSRC}/kern/vnode_if.src awk -f ${KSRC}/tools/vnode_if.awk ${KSRC}/kern/vnode_if.src -h awk -f ${KSRC}/tools/vnode_if.awk ${KSRC}/kern/vnode_if.src -q diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index e3907a063..5b8f034d3 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -21,7 +21,7 @@ CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${D OPTF=-O # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD -TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD40_ENV $(XCFLAGS) +TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS) TEST_LDFLAGS= TEST_LIBS=-lc_r diff --git a/src/rx/FBSD/rx_kmutex.h b/src/rx/FBSD/rx_kmutex.h index 39fe820e6..9e7b6a681 100644 --- a/src/rx/FBSD/rx_kmutex.h +++ b/src/rx/FBSD/rx_kmutex.h @@ -99,7 +99,7 @@ typedef struct mtx afs_kmutex_t; #define MUTEX_ISMINE(a) \ ( mtx_owned((a)) ) -#elif defined(AFS_FBSD50_ENV) +#else typedef struct { struct lock lock; @@ -135,74 +135,6 @@ typedef struct { #undef MUTEX_ISMINE #define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == curthread) -#elif defined(HEAVY_LOCKS) -typedef struct { - struct lock lock; - struct proc *owner; -} afs_kmutex_t; - - -#define MUTEX_INIT(a,b,c,d) \ - do { \ - lockinit(&(a)->lock, PSOCK, "afs rx mutex", 0, 0); \ - (a)->owner = 0; \ - } while(0); -#define MUTEX_DESTROY(a) \ - do { \ - (a)->owner = (struct proc *)-1; \ - } while(0); -#define MUTEX_ENTER(a) \ - do { \ - lockmgr(&(a)->lock, LK_EXCLUSIVE, 0, curproc); \ - osi_Assert((a)->owner == 0); \ - (a)->owner = curproc; \ - } while(0); -#define MUTEX_TRYENTER(a) \ - ( lockmgr(&(a)->lock, LK_EXCLUSIVE|LK_NOWAIT, 0, curproc) ? 0 : ((a)->owner = curproc, 1) ) -#define xMUTEX_TRYENTER(a) \ - ( osi_Assert((a)->owner == 0), (a)->owner = curproc, 1) -#define MUTEX_EXIT(a) \ - do { \ - osi_Assert((a)->owner == curproc); \ - (a)->owner = 0; \ - lockmgr(&(a)->lock, LK_RELEASE, 0, curproc); \ - } while(0); - -#undef MUTEX_ISMINE -#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == curproc) -#else -typedef struct { - struct simplelock lock; - struct proc *owner; -} afs_kmutex_t; - - -#define MUTEX_INIT(a,b,c,d) \ - do { \ - simple_lock_init(&(a)->lock); \ - (a)->owner = 0; \ - } while(0); -#define MUTEX_DESTROY(a) \ - do { \ - (a)->owner = (struct proc *)-1; \ - } while(0); -#define MUTEX_ENTER(a) \ - do { \ - simple_lock(&(a)->lock); \ - osi_Assert((a)->owner == 0); \ - (a)->owner = curproc; \ - } while(0); -#define MUTEX_TRYENTER(a) \ - ( simple_lock_try(&(a)->lock) ? 0 : ((a)->owner = curproc, 1) ) -#define MUTEX_EXIT(a) \ - do { \ - osi_Assert((a)->owner == curproc); \ - (a)->owner = 0; \ - simple_unlock(&(a)->lock); \ - } while(0); - -#undef MUTEX_ISMINE -#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == curproc) #endif diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c index 51443ccfa..77f2eabcd 100644 --- a/src/rx/FBSD/rx_knet.c +++ b/src/rx/FBSD/rx_knet.c @@ -11,7 +11,6 @@ #include "afs/param.h" -#ifdef AFS_FBSD40_ENV #include #include "rx/rx_kcommon.h" @@ -41,11 +40,7 @@ osi_NetReceive(osi_socket asocket, struct sockaddr_in *addr, u.uio_resid = *alength; u.uio_segflg = UIO_SYSSPACE; u.uio_rw = UIO_READ; -#ifdef AFS_FBSD50_ENV u.uio_td = NULL; -#else - u.uio_procp = NULL; -#endif if (haveGlock) AFS_GUNLOCK(); @@ -99,9 +94,7 @@ osi_StopListener(void) afs_warn("osi_StopListener: rxk_ListenerPid %lx\n", p); if (p) psignal(p, SIGUSR1); -#ifdef AFS_FBSD50_ENV PROC_UNLOCK(p); -#endif #ifdef AFS_FBSD70_ENV { /* Avoid destroying socket until osi_NetReceive has @@ -150,11 +143,7 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, u.uio_resid = alength; u.uio_segflg = UIO_SYSSPACE; u.uio_rw = UIO_WRITE; -#ifdef AFS_FBSD50_ENV u.uio_td = NULL; -#else - u.uio_procp = NULL; -#endif addr->sin_len = sizeof(struct sockaddr_in); @@ -163,14 +152,9 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, #if KNET_DEBUG printf("+"); #endif -#ifdef AFS_FBSD50_ENV code = sosend(asocket, (struct sockaddr *)addr, &u, NULL, NULL, 0, curthread); -#else - code = - sosend(asocket, (struct sockaddr *)addr, &u, NULL, NULL, 0, curproc); -#endif #if KNET_DEBUG if (code) { if (code == EINVAL) @@ -540,5 +524,3 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, return code; } #endif - -#endif /* AFS_FBSD40_ENV */ diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 30327113f..31fcaced2 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -829,7 +829,7 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) #else struct socket *newSocket; #endif -#if (!defined(AFS_HPUX1122_ENV) && !defined(AFS_FBSD50_ENV)) +#if (!defined(AFS_HPUX1122_ENV) && !defined(AFS_FBSD_ENV)) struct mbuf *nam; #endif struct sockaddr_in myaddr; @@ -872,11 +872,9 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) #endif /* else AFS_HPUX110_ENV */ #elif defined(AFS_SGI65_ENV) || defined(AFS_OBSD_ENV) code = socreate(AF_INET, &newSocket, SOCK_DGRAM, IPPROTO_UDP); -#elif defined(AFS_FBSD50_ENV) +#elif defined(AFS_FBSD_ENV) code = socreate(AF_INET, &newSocket, SOCK_DGRAM, IPPROTO_UDP, afs_osi_credp, curthread); -#elif defined(AFS_FBSD40_ENV) - code = socreate(AF_INET, &newSocket, SOCK_DGRAM, IPPROTO_UDP, curproc); #elif defined(AFS_DARWIN80_ENV) code = sock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, NULL, &newSocket); #elif defined(AFS_NBSD40_ENV) @@ -944,10 +942,8 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) } #endif #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) -#if defined(AFS_FBSD50_ENV) +#if defined(AFS_FBSD_ENV) code = sobind(newSocket, (struct sockaddr *)&myaddr, curthread); -#elif defined(AFS_FBSD40_ENV) - code = sobind(newSocket, (struct sockaddr *)&myaddr, curproc); #else code = sobind(newSocket, (struct sockaddr *)&myaddr); #endif diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 2dff7f7a9..ec2c28923 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -63,9 +63,7 @@ typedef unsigned short etap_event_t; #include "h/dirent.h" #include "h/socket.h" #include "h/domain.h" -#if defined(AFS_FBSD50_ENV) #include "h/bio.h" -#endif #include "h/buf.h" #include "h/mbuf.h" #endif /* AFS_FBSD_ENV */ -- 2.39.5