FBSD: Remove pre-8 code

Commit 123f0fb1 (config: remove support for old FreeBSD releases)
removed our support for FreeBSD releases before FreeBSD 8. However,
various areas of code still reference the symbols from those old
versions (e.g. AFS_FBSD53_ENV). Remove our ifdef logic for these old
symbols, according to the following rules:

- In FBSD-specific dirs, assume AFS_FBSD80_ENV is always true (as well
  as the symbols for earlier versions)

- In non-FBSD dirs, convert AFS_FBSD80_ENV to AFS_FBSD_ENV (and do the
  same for all earlier versions)

This allows us to remove code that was specific to older FreeBSD
versions, and simplify some ifdef conditionals.

Also remove the definitions for AFS_FBSD80_ENV and earlier versions in
our existing param.h files.

With this commit, the functions afs_start, afs_vop_lock,
afs_vop_unlock, and afs_vop_islocked are now always unreferenced, so
remove them.

Change-Id: Ia5a5ba5ee5b71a86cb4514305e20f1bb34487100
Reviewed-on: https://gerrit.openafs.org/13812
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Tim Creech <tcreech@tcreech.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c
index 1e7702c..01e5993 100644 (file)
--- a/src/afs/FBSD/osi_file.c
+++ b/src/afs/FBSD/osi_file.c
@@ -17,9 +17,6 @@
 
 
 int afs_osicred_initialized = 0;
-#ifndef AFS_FBSD80_ENV /* cr_groups is now malloc()'d */
-afs_ucred_t afs_osi_cred;
-#endif
 extern struct osi_dev cacheDev;
 extern struct mount *afs_cacheVfsp;
 
@@ -45,11 +42,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
        osi_FreeSmallSpace(afile);
        osi_Panic("UFSOpen: igetinode failed");
     }
-#if defined(AFS_FBSD80_ENV)
     VOP_UNLOCK(vp, 0);
-#else
-    VOP_UNLOCK(vp, 0, curthread);
-#endif
     afile->vnode = vp;
     afile->size = VTOI(vp)->i_size;
     afile->offset = 0;
@@ -64,15 +57,9 @@ afs_osi_Stat(struct osi_file *afile, struct osi_stat *astat)
     struct vattr tvattr;
     AFS_STATCNT(osi_Stat);
     AFS_GUNLOCK();
-#if defined(AFS_FBSD80_ENV)
     vn_lock(afile->vnode, LK_EXCLUSIVE | LK_RETRY);
     code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp);
     VOP_UNLOCK(afile->vnode, 0);
-#else
-    vn_lock(afile->vnode, LK_EXCLUSIVE | LK_RETRY, curthread);
-    code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, curthread);
-    VOP_UNLOCK(afile->vnode, LK_EXCLUSIVE, curthread);
-#endif
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
@@ -111,30 +98,17 @@ osi_UFSTruncate(struct osi_file *afile, afs_int32 asize)
     glocked = ISAFS_GLOCK();
     if (glocked)
       AFS_GUNLOCK();
-#if defined(AFS_FBSD80_ENV)
     vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
     code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp);
-#else
-    vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
-    code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, curthread);
-#endif
     if (code != 0 || tvattr.va_size <= asize)
        goto out;
 
     VATTR_NULL(&tvattr);
     tvattr.va_size = asize;
-#if defined(AFS_FBSD80_ENV)
     code = VOP_SETATTR(vp, &tvattr, afs_osi_credp);
-#else
-    code = VOP_SETATTR(vp, &tvattr, afs_osi_credp, curthread);
-#endif
 
 out:
-#if defined(AFS_FBSD80_ENV)
     VOP_UNLOCK(vp, 0);
-#else
-    VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
-#endif
     if (glocked)
       AFS_GLOCK();
     return code;

diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c
index e897f46..421a085 100644 (file)
--- a/src/afs/FBSD/osi_groups.c
+++ b/src/afs/FBSD/osi_groups.c
@@ -84,20 +84,15 @@ setpag(struct thread *td, struct ucred **cred, afs_uint32 pagvalue,
 #if defined(AFS_FBSD81_ENV)
     gid_t *gidset;
     int gidset_len = ngroups_max + 1;
-#elif defined(AFS_FBSD80_ENV)
+#else
     gid_t *gidset;
     int gidset_len = NGROUPS;  /* 1024 */
-#else
-    gid_t gidset[NGROUPS];
-    int gidset_len = NGROUPS;  /* 16 */
 #endif
     int ngroups, code;
     int j;
 
     AFS_STATCNT(setpag);
-#ifdef AFS_FBSD80_ENV
     gidset = osi_Alloc(gidset_len * sizeof(gid_t));
-#endif
     ngroups = afs_getgroups(*cred, gidset_len, gidset);
     if (afs_get_pag_from_groups(gidset[1], gidset[2]) == NOPAG) {
        /* We will have to shift grouplist to make room for pag */
@@ -112,9 +107,7 @@ setpag(struct thread *td, struct ucred **cred, afs_uint32 pagvalue,
     *newpag = (pagvalue == -1 ? genpag() : pagvalue);
     afs_get_groups_from_pag(*newpag, &gidset[1], &gidset[2]);
     code = afs_setgroups(td, cred, ngroups, gidset, change_parent);
-#ifdef AFS_FBSD80_ENV
     osi_Free(gidset, gidset_len * sizeof(gid_t));
-#endif
     return code;
 }
 

diff --git a/src/afs/FBSD/osi_inode.c b/src/afs/FBSD/osi_inode.c
index 8a89bab..f22efca 100644 (file)
--- a/src/afs/FBSD/osi_inode.c
+++ b/src/afs/FBSD/osi_inode.c
@@ -31,11 +31,7 @@ int
 getinode(fs, dev, inode, ipp, perror)
      struct mount *fs;
      struct inode **ipp;
-#ifdef AFS_FBSD53_ENV
      struct cdev *dev;
-#else
-     dev_t dev;
-#endif
      ino_t inode;
      int *perror;
 {
@@ -84,11 +80,7 @@ int
 igetinode(vfsp, dev, inode, ipp, perror)
      struct inode **ipp;
      struct mount *vfsp;
-#ifdef AFS_FBSD53_ENV
      struct cdev *dev;
-#else
-     dev_t dev;
-#endif
      ino_t inode;
      int *perror;
 {

diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h
index 2865120..406712a 100644 (file)
--- a/src/afs/FBSD/osi_machdep.h
+++ b/src/afs/FBSD/osi_machdep.h
@@ -23,9 +23,7 @@
 #include <sys/time.h>
 #include <sys/mutex.h>
 #include <sys/vnode.h>
-#if defined(AFS_FBSD80_ENV)
 #include <sys/priv.h>
-#endif
 
 /*
  * Time related macros
@@ -41,17 +39,15 @@ typedef struct proc afs_proc_t;
 #define iodone biodone
 #endif
 
-#ifdef AFS_FBSD80_ENV
 #define VSUID           S_ISUID
 #define VSGID           S_ISGID
-#endif
 
 #define osi_vnhold(avc,r)      vref(AFSTOV(avc))
 
 #define vType(vc)               AFSTOV(vc)->v_type
 #define vSetVfsp(vc, vfsp)     AFSTOV(vc)->v_mount = (vfsp)
 #define vSetType(vc, type)      AFSTOV(vc)->v_type = (type)
-#if defined(AFS_FBSD60_ENV) && defined(KERNEL)
+#ifdef KERNEL
 extern struct vop_vector afs_vnodeops;
 # define IsAfsVnode(v) ((v)->v_op == &afs_vnodeops)
 #else
@@ -60,14 +56,8 @@ extern int (**afs_vnodeop_p) ();
 #endif
 #define SetAfsVnode(v)          /* nothing; done in getnewvnode() */
 
-#if defined(AFS_FBSD80_ENV)
 #define osi_vinvalbuf(vp, flags, slpflag, slptimeo) \
   vinvalbuf((vp), (flags), (slpflag), (slptimeo))
-#else
-#define osi_vinvalbuf(vp, flags, slpflag, slptimeo) \
-  vinvalbuf((vp), (flags), (curthread), (slpflag), (slptimeo))
-#define osi_curproc() (curthread)
-#endif
 
 #undef gop_lookupname
 #define gop_lookupname osi_lookupname
@@ -83,26 +73,18 @@ extern void osi_fbsd_free(void *p);
 
 #define afs_osi_Alloc_NoSleep(size) osi_fbsd_alloc((size), 0)
 
-#ifdef AFS_FBSD80_ENV
 #define VN_RELE(vp)                            \
   do {                                         \
     vrele(vp);                                 \
   } while(0);
-#else
-#define VN_RELE(vp)             vrele(vp)
-#endif
 #define VN_HOLD(vp)            VREF(vp)
 
 #undef afs_suser
-#if defined(AFS_FBSD80_ENV)
 /* OpenAFS-specific privileges negotiated for FreeBSD, thanks due to
  * Ben Kaduk */
 #define osi_suser_client_settings(x)   (!priv_check(curthread, PRIV_AFS_ADMIN))
 #define osi_suser_afs_daemon(x)   (!priv_check(curthread, PRIV_AFS_DAEMON))
 #define afs_suser(x) (osi_suser_client_settings((x)) && osi_suser_afs_daemon((x)))
-#else
-#define afs_suser(x)   (!suser(curthread))
-#endif
 
 #undef osi_getpid
 #define VT_AFS         "afs"
@@ -129,7 +111,7 @@ extern struct thread *afs_global_owner;
        mtx_unlock(&afs_global_mtx); \
     } while (0)
 #define ISAFS_GLOCK() (mtx_owned(&afs_global_mtx))
-# if defined(AFS_FBSD80_ENV) && defined(WITNESS)
+# ifdef WITNESS
 #  define osi_InitGlock() \
        do { \
            memset(&afs_global_mtx, 0, sizeof(struct mtx)); \

diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c
index f22e258..8d3c998 100644 (file)
--- a/src/afs/FBSD/osi_misc.c
+++ b/src/afs/FBSD/osi_misc.c
@@ -48,11 +48,7 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink,
     }
     *vpp = n.ni_vp;
     /* XXX should we do this?  Usually NOT (matt) */
-#if defined(AFS_FBSD80_ENV)
     /*VOP_UNLOCK(n.ni_vp, 0);*/
-#else
-    VOP_UNLOCK(n.ni_vp, 0, curthread);
-#endif
     NDFREE(&n, NDF_ONLY_PNBUF);
     if (glocked)
        AFS_GLOCK();

diff --git a/src/afs/FBSD/osi_module.c b/src/afs/FBSD/osi_module.c
index 098a0a9..0ce956c 100644 (file)
--- a/src/afs/FBSD/osi_module.c
+++ b/src/afs/FBSD/osi_module.c
@@ -24,65 +24,4 @@ extern struct mount *afs_globalVFS;
 
 MALLOC_DEFINE(M_AFS, "afsmisc", "memory used by the AFS filesystem");
 
-#ifdef AFS_FBSD60_ENV
 VFS_SET(afs_vfsops, afs, VFCF_NETWORK);
-#else
-int afs_module_handler(module_t mod, int what, void *arg);
-
-static struct vfsconf afs_vfsconf;
-static moduledata_t afs_mod = {
-    "afs",
-    afs_module_handler,
-    &afs_mod
-};
-
-DECLARE_MODULE(afs, afs_mod, SI_SUB_VFS, SI_ORDER_MIDDLE);
-#endif
-
-#ifndef AFS_FBSD60_ENV
-int
-afs_module_handler(module_t mod, int what, void *arg)
-{
-    static int inited = 0;
-    int error = 0;
-
-    switch (what) {
-    case MOD_LOAD:
-       if (inited) {
-           printf("afs cannot be MOD_LOAD'd more than once\n");
-           error = EBUSY;
-           break;
-       }
-       memset(&afs_vfsconf, 0, sizeof(struct vfsconf));
-#ifdef AFS_FBSD53_ENV
-       afs_vfsconf.vfc_version = VFS_VERSION;
-#endif
-       strcpy(afs_vfsconf.vfc_name, "AFS");
-       afs_vfsconf.vfc_vfsops = &afs_vfsops;
-       afs_vfsconf.vfc_typenum = -1;   /* set by vfs_register */
-       afs_vfsconf.vfc_flags = VFCF_NETWORK;
-       if ((error = vfs_register(&afs_vfsconf)) != 0)
-           break;
-       vfs_add_vnodeops(&afs_vnodeop_opv_desc);
-       inited = 1;
-       break;
-    case MOD_UNLOAD:
-#ifndef RXK_LISTENER_ENV
-       /* shutdown is incomplete unless RXK_LISTENER_ENV */
-       printf("afs: I can't be unloaded yet\n");
-       return -1;
-#endif
-       if (!inited) {
-           error = 0;
-           break;
-       }
-       if ((error = vfs_unregister(&afs_vfsconf)) != 0) {
-           break;
-       }
-       vfs_rm_vnodeops(&afs_vnodeop_opv_desc);
-       break;
-    }
-
-    return (error);
-}
-#endif

diff --git a/src/afs/FBSD/osi_prototypes.h b/src/afs/FBSD/osi_prototypes.h
index 1e0bed8..c58eee2 100644 (file)
--- a/src/afs/FBSD/osi_prototypes.h
+++ b/src/afs/FBSD/osi_prototypes.h
@@ -23,11 +23,7 @@ extern void osi_fbsd_free(void *p);
 /* osi_vfsops.c */
 int afs_init(struct vfsconf *vfc);
 int afs_uninit(struct vfsconf *vfc);
-#if defined(AFS_FBSD80_ENV)
 extern int afs_statfs(struct mount *mp, struct statfs *abp);
-#else
-extern int afs_statfs(struct mount *mp, struct statfs *abp, struct thread *td);
-#endif
 
 extern int osi_fbsd_checkinuse(struct vcache *avc);
 

diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c
index d8dabd1..cd52055 100644 (file)
--- a/src/afs/FBSD/osi_vfsops.c
+++ b/src/afs/FBSD/osi_vfsops.c
@@ -28,18 +28,14 @@ static struct sysent old_sysent;
 static struct sysent afs_sysent = {
     5,                 /* int sy_narg */
     (sy_call_t *) afs3_syscall,        /* sy_call_t *sy_call */
-#ifdef AFS_FBSD60_ENV
     AUE_NULL,          /* au_event_t sy_auevent */
-#ifdef AFS_FBSD70_ENV
     NULL,              /* systrace_args_funt_t sy_systrace_args_func */
     0,                 /* u_int32_t sy_entry */
     0,                 /* u_int32_t sy_return */
-#ifdef AFS_FBSD90_ENV
+# ifdef AFS_FBSD90_ENV
     0,                 /* u_int32_t sy_flags */
     0                  /* u_int32_t sy_thrcnt */
-#endif
-#endif
-#endif /* FBSD60 */
+# endif
 };
 #endif /* FBSD90 */
 
@@ -94,20 +90,7 @@ afs_uninit(struct vfsconf *vfc)
 }
 
 int
-afs_start(struct mount *mp, int flags, struct thread *p)
-{
-    return (0);                        /* nothing to do. ? */
-}
-
-int
-#if defined(AFS_FBSD80_ENV)
 afs_omount(struct mount *mp, char *path, caddr_t data)
-#elif defined(AFS_FBSD53_ENV)
-afs_omount(struct mount *mp, char *path, caddr_t data, struct thread *p)
-#else
-afs_omount(struct mount *mp, char *path, caddr_t data, struct nameidata *ndp,
-       struct thread *p)
-#endif
 {
     /* ndp contains the mounted-from device.  Just ignore it.
      * we also don't care about our thread struct. */
@@ -132,19 +115,11 @@ afs_omount(struct mount *mp, char *path, caddr_t data, struct nameidata *ndp,
      * more fields over time and there's not a good way to group the
      * code without duplication.
      */
-#ifdef AFS_FBSD62_ENV
     MNT_ILOCK(mp);
-#endif
     mp->mnt_flag &= ~MNT_LOCAL;
-#if defined(AFS_FBSD61_ENV) && !defined(AFS_FBSD62_ENV)
-    MNT_ILOCK(mp);
-#endif
 #if __FreeBSD_version < 1000021
     mp->mnt_kern_flag |= MNTK_MPSAFE; /* solid steel */
 #endif
-#ifndef AFS_FBSD61_ENV
-    MNT_ILOCK(mp);
-#endif
     /*
      * XXX mnt_stat "is considered stable as long as a ref is held".
      * We should check that we hold the only ref.
@@ -162,51 +137,29 @@ afs_omount(struct mount *mp, char *path, caddr_t data, struct nameidata *ndp,
     strcpy(mp->mnt_stat.f_fstypename, "afs");
     MNT_IUNLOCK(mp);
     AFS_GUNLOCK();
-#ifdef AFS_FBSD80_ENV
     afs_statfs(mp, &mp->mnt_stat);
-#else
-    afs_statfs(mp, &mp->mnt_stat, p);
-#endif
 
     return 0;
 }
 
-#ifdef AFS_FBSD53_ENV
 int
-#ifdef AFS_FBSD80_ENV
 afs_mount(struct mount *mp)
-#else
-afs_mount(struct mount *mp, struct thread *td)
-#endif
 {
-#ifdef AFS_FBSD80_ENV
     return afs_omount(mp, NULL, NULL);
-#else
-    return afs_omount(mp, NULL, NULL, td);
-#endif
 }
-#endif
 
-#ifdef AFS_FBSD60_ENV
 static int
 #if (__FreeBSD_version >= 900503 && __FreeBSD_version < 1000000) || __FreeBSD_version >= 1000004
 afs_cmount(struct mntarg *ma, void *data, uint64_t flags)
-#elif defined(AFS_FBSD80_ENV)
-afs_cmount(struct mntarg *ma, void *data, int flags)
 #else
-afs_cmount(struct mntarg *ma, void *data, int flags, struct thread *td)
+afs_cmount(struct mntarg *ma, void *data, int flags)
 #endif
 {
     return kernel_mount(ma, flags);
 }
-#endif
 
 int
-#ifdef AFS_FBSD80_ENV
 afs_unmount(struct mount *mp, int flags)
-#else
-afs_unmount(struct mount *mp, int flags, struct thread *p)
-#endif
 {
     int error = 0;
 
@@ -228,13 +181,7 @@ afs_unmount(struct mount *mp, int flags, struct thread *p)
         * argument is how many refs we hold on the root vnode. Since we
         * released our reference to the root vnode up above, give 0.
         */
-#if defined(AFS_FBSD80_ENV)
        error = vflush(mp, 0, (flags & MNT_FORCE) ? FORCECLOSE : 0, curthread);
-#elif defined(AFS_FBSD53_ENV)
-       error = vflush(mp, 0, (flags & MNT_FORCE) ? FORCECLOSE : 0, p);
-#else
-       error = vflush(mp, 0, (flags & MNT_FORCE) ? FORCECLOSE : 0);
-#endif
     }
     if (error)
        goto out;
@@ -249,23 +196,13 @@ out:
 }
 
 int
-#if defined(AFS_FBSD80_ENV)
 afs_root(struct mount *mp, int flags, struct vnode **vpp)
-#elif defined(AFS_FBSD60_ENV)
-afs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td)
-#elif defined(AFS_FBSD53_ENV)
-afs_root(struct mount *mp, struct vnode **vpp, struct thread *td)
-#else
-afs_root(struct mount *mp, struct vnode **vpp)
-#endif
 {
     int error;
     struct vrequest treq;
     struct vcache *tvp = 0;
     struct vcache *gvp;
-#if !defined(AFS_FBSD53_ENV) || defined(AFS_FBSD80_ENV)
     struct thread *td = curthread;
-#endif
     struct ucred *cr = osi_curcred();
 
     AFS_GLOCK();
@@ -329,11 +266,7 @@ tryagain:
 }
 
 int
-#ifdef AFS_FBSD80_ENV
 afs_statfs(struct mount *mp, struct statfs *abp)
-#else
-afs_statfs(struct mount *mp, struct statfs *abp, struct thread *p)
-#endif
 {
     AFS_GLOCK();
     AFS_STATCNT(afs_statfs);
@@ -359,18 +292,11 @@ afs_statfs(struct mount *mp, struct statfs *abp, struct thread *p)
 }
 
 int
-#if defined(AFS_FBSD80_ENV)
 afs_sync(struct mount *mp, int waitfor)
-#elif defined(AFS_FBSD60_ENV)
-afs_sync(struct mount *mp, int waitfor, struct thread *td)
-#else
-afs_sync(struct mount *mp, int waitfor, struct ucred *cred, struct thread *p)
-#endif
 {
     return 0;
 }
 
-#ifdef AFS_FBSD60_ENV
 struct vfsops afs_vfsops = {
        .vfs_init =             afs_init,
        .vfs_mount =            afs_mount,
@@ -382,25 +308,3 @@ struct vfsops afs_vfsops = {
        .vfs_unmount =          afs_unmount,
        .vfs_sysctl =           vfs_stdsysctl,
 };
-#else
-struct vfsops afs_vfsops = {
-#ifdef AFS_FBSD53_ENV
-    afs_mount,
-#endif
-    afs_omount,
-    afs_start,
-    afs_unmount,
-    afs_root,
-    vfs_stdquotactl,
-    afs_statfs,
-    afs_sync,
-    vfs_stdvget,
-    vfs_stdfhtovp,
-    vfs_stdcheckexp,
-    vfs_stdvptofh,
-    afs_init,
-    afs_uninit,
-    vfs_stdextattrctl,
-    vfs_stdsysctl,
-};
-#endif

diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c
index d475d91..6dcd373 100644 (file)
--- a/src/afs/FBSD/osi_vm.c
+++ b/src/afs/FBSD/osi_vm.c
@@ -48,17 +48,10 @@
  * check the VCS history of those files.
  */
 
-#if defined(AFS_FBSD80_ENV)
 #define        lock_vnode(v, f)        vn_lock((v), (f))
 #define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY)
 #define unlock_vnode(v)        VOP_UNLOCK((v), 0)
 #define islocked_vnode(v)      VOP_ISLOCKED((v))
-#else
-#define        lock_vnode(v, f)        vn_lock((v), (f), curthread)
-#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY, curthread)
-#define unlock_vnode(v)        VOP_UNLOCK((v), 0, curthread)
-#define islocked_vnode(v)      VOP_ISLOCKED((v), curthread)
-#endif
 
 #if __FreeBSD_version >= 1000030
 #define AFS_VM_OBJECT_WLOCK(o) VM_OBJECT_WLOCK(o)

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index e0213a4..32c627a 100644 (file)
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -63,7 +63,6 @@
 #include <vm/vnode_pager.h>
 extern int afs_pbuf_freecnt;
 
-#ifdef AFS_FBSD60_ENV
 static vop_access_t    afs_vop_access;
 static vop_advlock_t   afs_vop_advlock;
 static vop_close_t     afs_vop_close;
@@ -92,11 +91,6 @@ static vop_setattr_t afs_vop_setattr;
 static vop_strategy_t  afs_vop_strategy;
 static vop_symlink_t   afs_vop_symlink;
 static vop_write_t     afs_vop_write;
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD80_ENV)
-static vop_lock1_t      afs_vop_lock;
-static vop_unlock_t     afs_vop_unlock;
-static vop_islocked_t   afs_vop_islocked;
-#endif
 
 struct vop_vector afs_vnodeops = {
        .vop_default =          &default_vnodeops,
@@ -109,10 +103,6 @@ struct vop_vector afs_vnodeops = {
        .vop_getpages =         afs_vop_getpages,
        .vop_inactive =         afs_vop_inactive,
        .vop_ioctl =            afs_vop_ioctl,
-#if !defined(AFS_FBSD80_ENV)
-       /* removed at least temporarily (NFSv4 flux) */
-       .vop_lease =            VOP_NULL,
-#endif
        .vop_link =             afs_vop_link,
        .vop_lookup =           afs_vop_lookup,
        .vop_mkdir =            afs_vop_mkdir,
@@ -132,96 +122,7 @@ struct vop_vector afs_vnodeops = {
        .vop_strategy =         afs_vop_strategy,
        .vop_symlink =          afs_vop_symlink,
        .vop_write =            afs_vop_write,
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD80_ENV)
-       .vop_lock1 =            afs_vop_lock,
-       .vop_unlock =           afs_vop_unlock,
-       .vop_islocked =         afs_vop_islocked,
-#endif
-};
-
-#else /* AFS_FBSD60_ENV */
-
-int afs_vop_lookup(struct vop_lookup_args *);
-int afs_vop_create(struct vop_create_args *);
-int afs_vop_mknod(struct vop_mknod_args *);
-int afs_vop_open(struct vop_open_args *);
-int afs_vop_close(struct vop_close_args *);
-int afs_vop_access(struct vop_access_args *);
-int afs_vop_getattr(struct vop_getattr_args *);
-int afs_vop_setattr(struct vop_setattr_args *);
-int afs_vop_read(struct vop_read_args *);
-int afs_vop_write(struct vop_write_args *);
-int afs_vop_getpages(struct vop_getpages_args *);
-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_fsync(struct vop_fsync_args *);
-int afs_vop_remove(struct vop_remove_args *);
-int afs_vop_link(struct vop_link_args *);
-int afs_vop_rename(struct vop_rename_args *);
-int afs_vop_mkdir(struct vop_mkdir_args *);
-int afs_vop_rmdir(struct vop_rmdir_args *);
-int afs_vop_symlink(struct vop_symlink_args *);
-int afs_vop_readdir(struct vop_readdir_args *);
-int afs_vop_readlink(struct vop_readlink_args *);
-int afs_vop_inactive(struct vop_inactive_args *);
-int afs_vop_reclaim(struct vop_reclaim_args *);
-int afs_vop_bmap(struct vop_bmap_args *);
-int afs_vop_strategy(struct vop_strategy_args *);
-int afs_vop_print(struct vop_print_args *);
-int afs_vop_advlock(struct vop_advlock_args *);
-
-
-
-/* Global vfs data structures for AFS. */
-vop_t **afs_vnodeop_p;
-struct vnodeopv_entry_desc afs_vnodeop_entries[] = {
-    {&vop_default_desc, (vop_t *) vop_defaultop},
-    {&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 */
-    {&vop_close_desc, (vop_t *) afs_vop_close},        /* close */
-    {&vop_createvobject_desc, (vop_t *) vop_stdcreatevobject},
-    {&vop_destroyvobject_desc, (vop_t *) vop_stddestroyvobject},
-    {&vop_create_desc, (vop_t *) afs_vop_create},      /* create */
-    {&vop_fsync_desc, (vop_t *) afs_vop_fsync},        /* fsync */
-    {&vop_getattr_desc, (vop_t *) afs_vop_getattr},    /* getattr */
-    {&vop_getpages_desc, (vop_t *) afs_vop_getpages},  /* read */
-    {&vop_getvobject_desc, (vop_t *) vop_stdgetvobject},
-    {&vop_putpages_desc, (vop_t *) afs_vop_putpages},  /* write */
-    {&vop_inactive_desc, (vop_t *) afs_vop_inactive},  /* inactive */
-    {&vop_lease_desc, (vop_t *) vop_null},
-    {&vop_link_desc, (vop_t *) afs_vop_link},  /* link */
-    {&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 */
-    {&vop_open_desc, (vop_t *) afs_vop_open},  /* open */
-    {&vop_pathconf_desc, (vop_t *) afs_vop_pathconf},  /* pathconf */
-    {&vop_poll_desc, (vop_t *) vop_nopoll},    /* select */
-    {&vop_print_desc, (vop_t *) afs_vop_print},        /* print */
-    {&vop_read_desc, (vop_t *) afs_vop_read},  /* read */
-    {&vop_readdir_desc, (vop_t *) afs_vop_readdir},    /* readdir */
-    {&vop_readlink_desc, (vop_t *) afs_vop_readlink},  /* readlink */
-    {&vop_reclaim_desc, (vop_t *) afs_vop_reclaim},    /* reclaim */
-    {&vop_remove_desc, (vop_t *) afs_vop_remove},      /* remove */
-    {&vop_rename_desc, (vop_t *) afs_vop_rename},      /* rename */
-    {&vop_rmdir_desc, (vop_t *) afs_vop_rmdir},        /* rmdir */
-    {&vop_setattr_desc, (vop_t *) afs_vop_setattr},    /* setattr */
-    {&vop_strategy_desc, (vop_t *) afs_vop_strategy},  /* strategy */
-    {&vop_symlink_desc, (vop_t *) afs_vop_symlink},    /* symlink */
-    {&vop_write_desc, (vop_t *) afs_vop_write},        /* write */
-    {&vop_ioctl_desc, (vop_t *) afs_vop_ioctl},        /* XXX ioctl */
-    /*{ &vop_seek_desc, afs_vop_seek }, *//* seek */
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD90_ENV)
-    {&vop_lock1_desc, (vop_t *) afs_vop_lock}, /* lock */
-    {&vop_unlock_desc, (vop_t *) afs_vop_unlock}, /* unlock */
-    {&vop_islocked_desc, (vop_t *) afs_vop_islocked}, /* islocked */
-#endif
-    {NULL, NULL}
 };
-struct vnodeopv_desc afs_vnodeop_opv_desc =
-    { &afs_vnodeop_p, afs_vnodeop_entries };
-#endif /* AFS_FBSD60_ENV */
 
 #define GETNAME()       \
     struct componentname *cnp = ap->a_cnp; \
@@ -248,23 +149,12 @@ static __inline void ma_vm_page_lock(vm_page_t m) {};
 static __inline void ma_vm_page_unlock(vm_page_t m) {};
 #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))
 #define MA_VOP_UNLOCK(vp, flags, p) (VOP_UNLOCK(vp, flags))
-#else
-#define ma_vn_lock(vp, flags, p) (vn_lock(vp, flags, p))
-#define MA_VOP_LOCK(vp, flags, p) (VOP_LOCK(vp, flags, p))
-#define MA_VOP_UNLOCK(vp, flags, p) (VOP_UNLOCK(vp, flags, p))
-#endif
 
-#if defined(AFS_FBSD70_ENV)
 #define MA_PCPU_INC(c) PCPU_INC(c)
 #define        MA_PCPU_ADD(c, n) PCPU_ADD(c, n)
-#else
-#define MA_PCPU_INC(c) PCPU_LAZY_INC(c)
-#define        MA_PCPU_ADD(c, n) (c) += (n)
-#endif
 
 #if __FreeBSD_version >= 1000030
 #define AFS_VM_OBJECT_WLOCK(o) VM_OBJECT_WLOCK(o)
@@ -274,107 +164,6 @@ static __inline void ma_vm_page_unlock(vm_page_t m) {};
 #define AFS_VM_OBJECT_WUNLOCK(o)       VM_OBJECT_UNLOCK(o)
 #endif
 
-#ifdef AFS_FBSD70_ENV
-#ifndef AFS_FBSD80_ENV
-/* From kern_lock.c */
-#define        COUNT(td, x)    if ((td)) (td)->td_locks += (x)
-#define LK_ALL (LK_HAVE_EXCL | LK_WANT_EXCL | LK_WANT_UPGRADE | \
-       LK_SHARE_NONZERO | LK_WAIT_NONZERO)
-
-static __inline void
-sharelock(struct thread *td, struct lock *lkp, int incr) {
-       lkp->lk_flags |= LK_SHARE_NONZERO;
-       lkp->lk_sharecount += incr;
-       COUNT(td, incr);
-}
-#endif
-
-/*
- * Standard lock, unlock and islocked functions.
- */
-int
-afs_vop_lock(ap)
-    struct vop_lock1_args /* {
-                            struct vnode *a_vp;
-                            int a_flags;
-                            struct thread *a_td;
-                            char *file;
-                            int line;
-                            } */ *ap;
-{
-    struct vnode *vp = ap->a_vp;
-    struct lock *lkp = vp->v_vnlock;
-
-#ifdef AFS_FBSD80_ENV
-    return (_lockmgr_args(lkp, ap->a_flags, VI_MTX(vp),
-                         LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT,
-                         ap->a_file, ap->a_line));
-#else
-    return (_lockmgr(lkp, ap->a_flags, VI_MTX(vp), ap->a_td, ap->a_file, ap->a_line));
-#endif
-}
-
-/* See above. */
-int
-afs_vop_unlock(ap)
-    struct vop_unlock_args /* {
-                             struct vnode *a_vp;
-                             int a_flags;
-                             struct thread *a_td;
-                             } */ *ap;
-{
-    struct vnode *vp = ap->a_vp;
-    struct lock *lkp = vp->v_vnlock;
-
-#ifdef AFS_FBSD80_ENV
-    int code = 0;
-    u_int op;
-    op = ((ap->a_flags) | LK_RELEASE) & LK_TYPE_MASK;
-    int glocked = ISAFS_GLOCK();
-    if (glocked)
-       AFS_GUNLOCK();
-    if ((op & (op - 1)) != 0) {
-      afs_warn("afs_vop_unlock: Shit.\n");
-      goto done;
-    }
-    code = lockmgr(lkp, ap->a_flags | LK_RELEASE, VI_MTX(vp));
- done:
-    if (glocked)
-       AFS_GLOCK();
-    return(code);
-#else
-    /* possibly in current code path where this
-     * forces trace, we should have had a (shared? not
-     * necessarily, see _lockmgr in kern_lock.c) lock
-     * and that's the real bug.  but. 
-     */
-    critical_enter();
-    if ((lkp->lk_exclusivecount == 0) &&
-       (!(lkp->lk_flags & LK_SHARE_NONZERO))) {
-       sharelock(ap->a_td, lkp, 1);
-    }
-    critical_exit();
-    return (lockmgr(lkp, ap->a_flags | LK_RELEASE, VI_MTX(vp),
-                   ap->a_td));
-#endif
-}
-
-/* See above. */
-int
-afs_vop_islocked(ap)
-    struct vop_islocked_args /* {
-                               struct vnode *a_vp;
-                               struct thread *a_td; (not in 80)
-                               } */ *ap;
-{
-#ifdef AFS_FBSD80_ENV
-    return (lockstatus(ap->a_vp->v_vnlock));
-#else
-    return (lockstatus(ap->a_vp->v_vnlock, ap->a_td));
-#endif
-}
-#endif /* 70 */
-
 /*
  * Mosty copied from sys/ufs/ufs/ufs_vnops.c:ufs_pathconf().
  * We should know the correct answers to these questions with
@@ -483,15 +272,9 @@ afs_vop_lookup(ap)
     int flags = ap->a_cnp->cn_flags;
     int lockparent;            /* 1 => lockparent flag is set */
     int wantparent;            /* 1 => wantparent or lockparent flag */
-#ifndef AFS_FBSD80_ENV
-    struct thread *p = ap->a_cnp->cn_thread;
-#endif
 
     dvp = ap->a_dvp;
     if (dvp->v_type != VDIR) {
-#ifndef AFS_FBSD70_ENV
-       *ap->a_vpp = 0;
-#endif
        return ENOTDIR;
     }
 
@@ -547,11 +330,6 @@ afs_vop_lookup(ap)
        /* they're the same; afs_lookup() already ref'ed the leaf.
         * It came in locked, so we don't need to ref OR lock it */
     } else {
-       if (!lockparent || !(flags & ISLASTCN)) {
-#ifndef AFS_FBSD70_ENV /* 6 too? */
-           MA_VOP_UNLOCK(dvp, 0, p);   /* done with parent. */
-#endif
-       }
        ma_vn_lock(vp, LK_EXCLUSIVE | LK_CANRECURSE | LK_RETRY, p);
        /* always return the child locked */
     }
@@ -577,9 +355,6 @@ afs_vop_create(ap)
     int error = 0;
     struct vcache *vcp;
     struct vnode *dvp = ap->a_dvp;
-#ifndef AFS_FBSD80_ENV
-    struct thread *p = ap->a_cnp->cn_thread;
-#endif
     GETNAME();
 
     AFS_GLOCK();
@@ -635,9 +410,7 @@ afs_vop_open(ap)
        panic("AFS open changed vnode!");
 #endif
     AFS_GUNLOCK();
-#ifdef AFS_FBSD60_ENV
     vnode_create_vobject(ap->a_vp, vc->f.m.Length, ap->a_td);
-#endif
     osi_FlushPages(vc, ap->a_cred);
     return error;
 }
@@ -655,7 +428,6 @@ afs_vop_close(ap)
     struct vnode *vp = ap->a_vp;
     struct vcache *avc = VTOAFS(vp);
 
-#if defined(AFS_FBSD80_ENV)
     VI_LOCK(vp);
     iflag = vp->v_iflag & VI_DOOMED;
     VI_UNLOCK(vp);
@@ -667,7 +439,6 @@ afs_vop_close(ap)
                   vp, avc, avc->opens);
         return 0;
     }
-#endif
 
     AFS_GLOCK();
     if (ap->a_cred)
@@ -690,11 +461,7 @@ afs_vop_access(ap)
 {
     int code;
     AFS_GLOCK();
-#if defined(AFS_FBSD80_ENV)
     code = afs_access(VTOAFS(ap->a_vp), ap->a_accmode, ap->a_cred);
-#else
-    code = afs_access(VTOAFS(ap->a_vp), ap->a_mode, ap->a_cred);
-#endif
     AFS_GUNLOCK();
     return code;
 }
@@ -891,11 +658,7 @@ afs_vop_getpages(struct vop_getpages_args *ap)
             * Read operation filled an entire page
             */
            m->valid = VM_PAGE_BITS_ALL;
-#ifndef AFS_FBSD80_ENV
-           vm_page_undirty(m);
-#else
            KASSERT(m->dirty == 0, ("afs_getpages: page %p is dirty", m));
-#endif
        } else if (size > toff) {
            /*
             * Read operation filled a partial page.
@@ -923,11 +686,7 @@ afs_vop_getpages(struct vop_getpages_args *ap)
             * now tell them that it is ok to use.
             */
            if (!code) {
-#if defined(AFS_FBSD70_ENV)
                if (m->oflags & VPO_WANTED) {
-#else
-               if (m->flags & PG_WANTED) {
-#endif
                    ma_vm_page_lock(m);
                    vm_page_activate(m);
                    ma_vm_page_unlock(m);
@@ -1095,14 +854,7 @@ afs_vop_fsync(ap)
 
     AFS_GLOCK();
     /*vflushbuf(vp, wait); */
-#ifdef AFS_FBSD60_ENV
     error = afs_fsync(VTOAFS(vp), ap->a_td->td_ucred);
-#else
-    if (ap->a_cred)
-       error = afs_fsync(VTOAFS(vp), ap->a_cred);
-    else
-       error = afs_fsync(VTOAFS(vp), afs_osi_credp);
-#endif
     AFS_GUNLOCK();
     return error;
 }
@@ -1139,9 +891,6 @@ afs_vop_link(ap)
     int error = 0;
     struct vnode *dvp = ap->a_tdvp;
     struct vnode *vp = ap->a_vp;
-#ifndef AFS_FBSD80_ENV
-    struct thread *p = ap->a_cnp->cn_thread;
-#endif
 
     GETNAME();
     if (dvp->v_mount != vp->v_mount) {
@@ -1185,9 +934,6 @@ afs_vop_rename(ap)
     struct vnode *tdvp = ap->a_tdvp;
     struct vnode *fvp = ap->a_fvp;
     struct vnode *fdvp = ap->a_fdvp;
-#ifndef AFS_FBSD80_ENV
-    struct thread *p = fcnp->cn_thread;
-#endif
 
     /*
      * Check for cross-device rename.
@@ -1289,9 +1035,6 @@ afs_vop_mkdir(ap)
     struct vattr *vap = ap->a_vap;
     int error = 0;
     struct vcache *vcp;
-#ifndef AFS_FBSD80_ENV
-    struct thread *p = ap->a_cnp->cn_thread;
-#endif
 
     GETNAME();
 #ifdef DIAGNOSTIC
@@ -1449,9 +1192,6 @@ afs_vop_inactive(ap)
     AFS_GLOCK();
     afs_InactiveVCache(VTOAFS(vp), 0); /* decrs ref counts */
     AFS_GUNLOCK();
-#ifndef AFS_FBSD60_ENV
-    MA_VOP_UNLOCK(vp, 0, ap->a_td);
-#endif
     return 0;
 }
 
@@ -1499,33 +1239,6 @@ afs_vop_reclaim(struct vop_reclaim_args *ap)
     return 0;
 }
 
-#ifndef AFS_FBSD60_ENV
-int
-afs_vop_bmap(ap)
-     struct vop_bmap_args      /* {
-                                * struct vnode *a_vp;
-                                * daddr_t  a_bn;
-                                * struct vnode **a_vpp;
-                                * daddr_t *a_bnp;
-                                * int *a_runp;
-                                * int *a_runb;
-                                * } */ *ap;
-{
-    if (ap->a_bnp) {
-       *ap->a_bnp = ap->a_bn * (PAGE_SIZE / DEV_BSIZE);
-    }
-    if (ap->a_vpp) {
-       *ap->a_vpp = ap->a_vp;
-    }
-    if (ap->a_runp != NULL)
-       *ap->a_runp = 0;
-    if (ap->a_runb != NULL)
-       *ap->a_runb = 0;
-
-    return 0;
-}
-#endif
-
 int
 afs_vop_strategy(ap)
      struct vop_strategy_args  /* {

diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c
index 1a8ca87..e5c6642 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_read.c
+++ b/src/afs/VNOPS/afs_vnop_read.c
@@ -562,18 +562,12 @@ afs_UFSReadUIO(afs_dcache_id_t *cacheId, struct uio *tuiop)
     code = VOP_READ(tfile->vnode, tuiop, 0, afs_osi_credp);
     VOP_UNLOCK(tfile->vnode, 0, current_proc());
     AFS_GLOCK();
-#elif defined(AFS_FBSD80_ENV)
+#elif defined(AFS_FBSD_ENV)
     AFS_GUNLOCK();
     VOP_LOCK(tfile->vnode, LK_EXCLUSIVE);
     code = VOP_READ(tfile->vnode, tuiop, 0, afs_osi_credp);
     VOP_UNLOCK(tfile->vnode, 0);
     AFS_GLOCK();
-#elif defined(AFS_FBSD_ENV)
-    AFS_GUNLOCK();
-    VOP_LOCK(tfile->vnode, LK_EXCLUSIVE, curthread);
-    code = VOP_READ(tfile->vnode, tuiop, 0, afs_osi_credp);
-    VOP_UNLOCK(tfile->vnode, 0, curthread);
-    AFS_GLOCK();
 #elif defined(AFS_NBSD_ENV)
     tuiop->uio_rw = UIO_READ;
     AFS_GUNLOCK();

diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c
index 97b6993..978df88 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_strategy.c
+++ b/src/afs/VNOPS/afs_vnop_strategy.c
@@ -208,10 +208,8 @@ int afs_ustrategy(struct buf *abp)
 
 #if defined(AFS_AIX32_ENV)
     crfree(credp);
-#elif defined(AFS_FBSD60_ENV)
-    (*abp->b_iodone)(abp);
 #elif defined(AFS_FBSD_ENV)
-    biodone(&abp->b_io);
+    (*abp->b_iodone)(abp);
 #elif defined(AFS_NBSD40_ENV)
     abp->b_resid = tuio.uio_resid;
     biodone(abp);

diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c
index c720f6a..32d69f4 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_write.c
+++ b/src/afs/VNOPS/afs_vnop_write.c
@@ -159,18 +159,12 @@ afs_UFSWriteUIO(struct vcache *avc, afs_dcache_id_t *inode, struct uio *tuiop)
     code = VOP_WRITE(tfile->vnode, tuiop, 0, afs_osi_credp);
     VOP_UNLOCK(tfile->vnode, 0, current_proc());
     AFS_GLOCK();
-#elif defined(AFS_FBSD80_ENV)
+#elif defined(AFS_FBSD_ENV)
     AFS_GUNLOCK();
     VOP_LOCK(tfile->vnode, LK_EXCLUSIVE);
     code = VOP_WRITE(tfile->vnode, tuiop, 0, afs_osi_credp);
     VOP_UNLOCK(tfile->vnode, 0);
     AFS_GLOCK();
-#elif defined(AFS_FBSD_ENV)
-    AFS_GUNLOCK();
-    VOP_LOCK(tfile->vnode, LK_EXCLUSIVE, curthread);
-    code = VOP_WRITE(tfile->vnode, tuiop, 0, afs_osi_credp);
-    VOP_UNLOCK(tfile->vnode, 0, curthread);
-    AFS_GLOCK();
 #elif defined(AFS_NBSD_ENV)
     AFS_GUNLOCK();
     VOP_LOCK(tfile->vnode, LK_EXCLUSIVE);
@@ -635,7 +629,7 @@ afs_close(OSI_VC_DECL(avc), afs_int32 aflags, afs_ucred_t *acred)
            code_checkcode = avc->vc_error;
            avc->vc_error = 0;
        }
-#if defined(AFS_FBSD80_ENV)
+#if defined(AFS_FBSD_ENV)
         /* XXX */
         if (!avc->opens) {
             afs_int32 opens, is_free, is_gone, is_doomed, iflag;

diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c
index fe30973..277eb66 100644 (file)
--- a/src/afs/afs_init.c
+++ b/src/afs/afs_init.c
@@ -432,7 +432,7 @@ afs_InitCacheInfo(char *afile)
 #elif defined(AFS_DARWIN80_ENV)
         afs_cacheVfsp = vnode_mount(filevp);
        if (afs_cacheVfsp && ((st = *(vfs_statfs(afs_cacheVfsp))),1))
-#elif defined(AFS_FBSD80_ENV)
+#elif defined(AFS_FBSD_ENV)
        if (!VFS_STATFS(filevp->v_mount, &st))
 #elif defined(AFS_NBSD50_ENV)
        if (!VFS_STATVFS(filevp->v_vfsp, &st))

diff --git a/src/afs/afs_osi_vm.c b/src/afs/afs_osi_vm.c
index 1688c58..569be55 100644 (file)
--- a/src/afs/afs_osi_vm.c
+++ b/src/afs/afs_osi_vm.c
@@ -93,11 +93,11 @@ osi_FlushPages(struct vcache *avc, afs_ucred_t *credp)
               ICL_TYPE_INT32, origDV.low, ICL_TYPE_INT32, avc->f.m.Length);
 
     ReleaseWriteLock(&avc->lock);
-#ifndef AFS_FBSD70_ENV
+#ifndef AFS_FBSD_ENV
     AFS_GUNLOCK();
 #endif
     osi_VM_FlushPages(avc, credp);
-#ifndef AFS_FBSD70_ENV
+#ifndef AFS_FBSD_ENV
     AFS_GLOCK();
 #endif
     ObtainWriteLock(&avc->lock, 88);

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 50f804c..07a931b 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -1258,10 +1258,10 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow)
        dput(dp);
        AFS_GLOCK();
 #else
-#if defined(AFS_FBSD80_ENV)
+#if defined(AFS_FBSD_ENV)
     if (VOP_ISLOCKED(vp))
        VOP_UNLOCK(vp, 0);
-#endif /* AFS_FBSD80_ENV */
+#endif /* AFS_FBSD_ENV */
        AFS_RELE(vp);           /* put vnode back */
 #endif
     }
@@ -4621,7 +4621,7 @@ HandleClientContext(struct afs_ioctl *ablob, int *com,
 #ifdef AFS_AIX_ENV
     newcred->cr_ngrps = 2;
 #elif !defined(AFS_LINUX26_ENV) && !defined(AFS_SUN510_ENV)
-# if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_FBSD80_ENV)
+# if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_FBSD_ENV)
     newcred->cr_ngroups = 2;
 # else
     for (i = 2; i < NGROUPS; i++)

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index f49bda2..e6a1d0f 100644 (file)
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -1354,7 +1354,7 @@ afs_SetServerPrefs(struct srvAddr *const sa)
            TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) {
                afsi_SetServerIPRank(sa, ifa);
     }}}
-#elif defined(AFS_FBSD80_ENV)
+#elif defined(AFS_FBSD_ENV)
     {
        struct in_ifaddr *ifa;
        CURVNET_SET(rx_socket->so_vnet);
@@ -1363,13 +1363,6 @@ afs_SetServerPrefs(struct srvAddr *const sa)
        }
        CURVNET_RESTORE();
     }
-#elif defined(AFS_FBSD_ENV)
-    {
-       struct in_ifaddr *ifa;
-       TAILQ_FOREACH(ifa, &in_ifaddrhead, ia_link) {
-           afsi_SetServerIPRank(sa, &ifa->ia_ifa);
-       }
-    }
 #elif defined(AFS_OBSD_ENV)
     {
        extern struct in_ifaddrhead in_ifaddr;

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index e91c481..6bdf8e7 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -1741,7 +1741,7 @@ afs_GetVCache(struct VenusFid *afid, struct vrequest *areq)
          ObtainWriteLock(&tvc->lock, 954);
        if (!iheldthelock)
            VOP_UNLOCK(vp, LK_EXCLUSIVE, current_proc());
-#elif defined(AFS_FBSD80_ENV)
+#elif defined(AFS_FBSD_ENV)
        iheldthelock = VOP_ISLOCKED(vp);
        if (!iheldthelock) {
            /* nosleep/sleep lock order reversal */
@@ -1755,22 +1755,6 @@ afs_GetVCache(struct VenusFid *afid, struct vrequest *areq)
        vinvalbuf(vp, V_SAVE, PINOD, 0); /* changed late in 8.0-CURRENT */
        if (!iheldthelock)
            VOP_UNLOCK(vp, 0);
-#elif defined(AFS_FBSD60_ENV)
-       iheldthelock = VOP_ISLOCKED(vp, curthread);
-       if (!iheldthelock)
-           vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
-       AFS_GUNLOCK();
-       vinvalbuf(vp, V_SAVE, curthread, PINOD, 0);
-       AFS_GLOCK();
-       if (!iheldthelock)
-           VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
-#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_OBSD_ENV)
        iheldthelock = VOP_ISLOCKED(vp, curproc);
        if (!iheldthelock)

diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index 71de913..6f4442b 100644 (file)
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -577,11 +577,9 @@ afsd_mount_afs(const char *rn, const char *cacheMountDir)
     if (afsd_verbose)
        printf("%s: Mounting the AFS root on '%s', flags: %d.\n", rn,
            cacheMountDir, mountFlags);
-#if defined(AFS_FBSD60_ENV)
+#if defined(AFS_FBSD_ENV)
     /* data must be non-const non-NULL but is otherwise ignored */
     if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, &mountFlags)) < 0) {
-#elif defined(AFS_FBSD_ENV)
-    if ((mount("AFS", cacheMountDir, mountFlags, (caddr_t) 0)) < 0) {
 #elif defined(AFS_AIX_ENV)
     if (aix_vmount(cacheMountDir)) {
 #elif defined(AFS_HPUX100_ENV)

diff --git a/src/config/param.amd64_fbsd_100.h b/src/config/param.amd64_fbsd_100.h
index 3b38a43..4e4c5aa 100644 (file)
--- a/src/config/param.amd64_fbsd_100.h
+++ b/src/config/param.amd64_fbsd_100.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -34,14 +22,6 @@
 #define AFS_FBSD93_ENV 1
 #define AFS_FBSD100_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -56,17 +36,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_101.h b/src/config/param.amd64_fbsd_101.h
index 7ca16ca..6174faa 100644 (file)
--- a/src/config/param.amd64_fbsd_101.h
+++ b/src/config/param.amd64_fbsd_101.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -35,14 +23,6 @@
 #define AFS_FBSD100_ENV 1
 #define AFS_FBSD101_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -58,17 +38,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_102.h b/src/config/param.amd64_fbsd_102.h
index 424fb33..236b913 100644 (file)
--- a/src/config/param.amd64_fbsd_102.h
+++ b/src/config/param.amd64_fbsd_102.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -36,14 +24,6 @@
 #define AFS_FBSD101_ENV 1
 #define AFS_FBSD102_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -60,17 +40,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_103.h b/src/config/param.amd64_fbsd_103.h
index 5121e6d..f7ed49e 100644 (file)
--- a/src/config/param.amd64_fbsd_103.h
+++ b/src/config/param.amd64_fbsd_103.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -37,14 +25,6 @@
 #define AFS_FBSD102_ENV 1
 #define AFS_FBSD103_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -62,17 +42,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_104.h b/src/config/param.amd64_fbsd_104.h
index 05d0305..cd3688d 100644 (file)
--- a/src/config/param.amd64_fbsd_104.h
+++ b/src/config/param.amd64_fbsd_104.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -38,14 +26,6 @@
 #define AFS_FBSD103_ENV 1
 #define AFS_FBSD104_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -64,17 +44,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_110.h b/src/config/param.amd64_fbsd_110.h
index 72b371a..d1bdb8d 100644 (file)
--- a/src/config/param.amd64_fbsd_110.h
+++ b/src/config/param.amd64_fbsd_110.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -35,14 +23,6 @@
 #define AFS_FBSD100_ENV 1
 #define AFS_FBSD110_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -58,17 +38,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_111.h b/src/config/param.amd64_fbsd_111.h
index 167314e..a9c92b4 100644 (file)
--- a/src/config/param.amd64_fbsd_111.h
+++ b/src/config/param.amd64_fbsd_111.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -39,14 +27,6 @@
 #define AFS_FBSD110_ENV 1
 #define AFS_FBSD111_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -66,17 +46,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_112.h b/src/config/param.amd64_fbsd_112.h
index 254b2bd..308c184 100644 (file)
--- a/src/config/param.amd64_fbsd_112.h
+++ b/src/config/param.amd64_fbsd_112.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -40,14 +28,6 @@
 #define AFS_FBSD111_ENV 1
 #define AFS_FBSD112_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -68,17 +48,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_120.h b/src/config/param.amd64_fbsd_120.h
index 2179a81..9d995de 100644 (file)
--- a/src/config/param.amd64_fbsd_120.h
+++ b/src/config/param.amd64_fbsd_120.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -41,14 +29,6 @@
 #define AFS_FBSD111_ENV 1
 #define AFS_FBSD120_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -70,17 +50,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_80.h b/src/config/param.amd64_fbsd_80.h
index 29b0346..ba701d3 100644 (file)
--- a/src/config/param.amd64_fbsd_80.h
+++ b/src/config/param.amd64_fbsd_80.h
@@ -12,44 +12,10 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
-
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
-
 #else /* !defined(UKERNEL) */
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
-
 #endif /* !defined(UKERNEL) */
 
 #endif /* AFS_PARAM_H */

diff --git a/src/config/param.amd64_fbsd_81.h b/src/config/param.amd64_fbsd_81.h
index 006e064..bd3ca57 100644 (file)
--- a/src/config/param.amd64_fbsd_81.h
+++ b/src/config/param.amd64_fbsd_81.h
@@ -12,45 +12,14 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 
 #else /* !defined(UKERNEL) */
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 
 #endif /* !defined(UKERNEL) */

diff --git a/src/config/param.amd64_fbsd_82.h b/src/config/param.amd64_fbsd_82.h
index c8d9591..58a9cdb 100644 (file)
--- a/src/config/param.amd64_fbsd_82.h
+++ b/src/config/param.amd64_fbsd_82.h
@@ -12,29 +12,9 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 
@@ -42,17 +22,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 

diff --git a/src/config/param.amd64_fbsd_83.h b/src/config/param.amd64_fbsd_83.h
index d27d314..5d336a5 100644 (file)
--- a/src/config/param.amd64_fbsd_83.h
+++ b/src/config/param.amd64_fbsd_83.h
@@ -12,30 +12,10 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -44,17 +24,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_84.h b/src/config/param.amd64_fbsd_84.h
index 903c83b..f5fae34 100644 (file)
--- a/src/config/param.amd64_fbsd_84.h
+++ b/src/config/param.amd64_fbsd_84.h
@@ -12,31 +12,11 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
 #define AFS_FBSD84_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -46,17 +26,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_90.h b/src/config/param.amd64_fbsd_90.h
index e56c2d0..95130de 100644 (file)
--- a/src/config/param.amd64_fbsd_90.h
+++ b/src/config/param.amd64_fbsd_90.h
@@ -12,32 +12,12 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
 #define AFS_FBSD84_ENV 1
 #define AFS_FBSD90_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -48,17 +28,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_91.h b/src/config/param.amd64_fbsd_91.h
index 3ef236a..75fda5b 100644 (file)
--- a/src/config/param.amd64_fbsd_91.h
+++ b/src/config/param.amd64_fbsd_91.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -31,14 +19,6 @@
 #define AFS_FBSD90_ENV 1
 #define AFS_FBSD91_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -50,17 +30,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_92.h b/src/config/param.amd64_fbsd_92.h
index 95c6e19..efed685 100644 (file)
--- a/src/config/param.amd64_fbsd_92.h
+++ b/src/config/param.amd64_fbsd_92.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -32,14 +20,6 @@
 #define AFS_FBSD91_ENV 1
 #define AFS_FBSD92_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -52,17 +32,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.amd64_fbsd_93.h b/src/config/param.amd64_fbsd_93.h
index 1a798c8..20e0cab 100644 (file)
--- a/src/config/param.amd64_fbsd_93.h
+++ b/src/config/param.amd64_fbsd_93.h
@@ -12,18 +12,6 @@
 
 #define AFS_64BITUSERPOINTER_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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -33,14 +21,6 @@
 #define AFS_FBSD92_ENV 1
 #define AFS_FBSD93_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD73_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -54,17 +34,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_100.h b/src/config/param.i386_fbsd_100.h
index 0e898c4..ee6e616 100644 (file)
--- a/src/config/param.i386_fbsd_100.h
+++ b/src/config/param.i386_fbsd_100.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -33,18 +20,6 @@
 #define AFS_FBSD93_ENV 1
 #define AFS_FBSD100_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -59,18 +34,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_101.h b/src/config/param.i386_fbsd_101.h
index 6224bf2..950e4b2 100644 (file)
--- a/src/config/param.i386_fbsd_101.h
+++ b/src/config/param.i386_fbsd_101.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -34,18 +21,6 @@
 #define AFS_FBSD100_ENV 1
 #define AFS_FBSD101_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -61,18 +36,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_102.h b/src/config/param.i386_fbsd_102.h
index 32c8b8e..30de8e4 100644 (file)
--- a/src/config/param.i386_fbsd_102.h
+++ b/src/config/param.i386_fbsd_102.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -35,18 +22,6 @@
 #define AFS_FBSD101_ENV 1
 #define AFS_FBSD102_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -63,18 +38,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_103.h b/src/config/param.i386_fbsd_103.h
index 55eb48e..598ed41 100644 (file)
--- a/src/config/param.i386_fbsd_103.h
+++ b/src/config/param.i386_fbsd_103.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -36,18 +23,6 @@
 #define AFS_FBSD102_ENV 1
 #define AFS_FBSD103_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -65,18 +40,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_104.h b/src/config/param.i386_fbsd_104.h
index 2af6a8b..3ec50f1 100644 (file)
--- a/src/config/param.i386_fbsd_104.h
+++ b/src/config/param.i386_fbsd_104.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -37,18 +24,6 @@
 #define AFS_FBSD103_ENV 1
 #define AFS_FBSD104_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -67,18 +42,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_110.h b/src/config/param.i386_fbsd_110.h
index 066c842..7d7129c 100644 (file)
--- a/src/config/param.i386_fbsd_110.h
+++ b/src/config/param.i386_fbsd_110.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -35,18 +22,6 @@
 #define AFS_FBSD101_ENV 1
 #define AFS_FBSD110_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -63,18 +38,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_111.h b/src/config/param.i386_fbsd_111.h
index 4649ac8..cd33dfd 100644 (file)
--- a/src/config/param.i386_fbsd_111.h
+++ b/src/config/param.i386_fbsd_111.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -38,18 +25,6 @@
 #define AFS_FBSD110_ENV 1
 #define AFS_FBSD111_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -69,18 +44,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_112.h b/src/config/param.i386_fbsd_112.h
index 6ea9bd7..f2c0131 100644 (file)
--- a/src/config/param.i386_fbsd_112.h
+++ b/src/config/param.i386_fbsd_112.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -39,18 +26,6 @@
 #define AFS_FBSD111_ENV 1
 #define AFS_FBSD112_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -71,18 +46,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_120.h b/src/config/param.i386_fbsd_120.h
index 7c12258..399d9d9 100644 (file)
--- a/src/config/param.i386_fbsd_120.h
+++ b/src/config/param.i386_fbsd_120.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -40,18 +27,6 @@
 #define AFS_FBSD111_ENV 1
 #define AFS_FBSD120_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -73,18 +48,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_80.h b/src/config/param.i386_fbsd_80.h
index 02a52d3..769cb9b 100644 (file)
--- a/src/config/param.i386_fbsd_80.h
+++ b/src/config/param.i386_fbsd_80.h
@@ -10,50 +10,10 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
-
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
-
 #else /* !defined(UKERNEL) */
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
-
 #endif /* !defined(UKERNEL) */
 
 #endif /* AFS_PARAM_H */

diff --git a/src/config/param.i386_fbsd_81.h b/src/config/param.i386_fbsd_81.h
index 5112efe..bcf4b1d 100644 (file)
--- a/src/config/param.i386_fbsd_81.h
+++ b/src/config/param.i386_fbsd_81.h
@@ -10,51 +10,14 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 
 #else /* !defined(UKERNEL) */
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 
 #endif /* !defined(UKERNEL) */

diff --git a/src/config/param.i386_fbsd_82.h b/src/config/param.i386_fbsd_82.h
index 12f15c4..d91a166 100644 (file)
--- a/src/config/param.i386_fbsd_82.h
+++ b/src/config/param.i386_fbsd_82.h
@@ -10,34 +10,9 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 
@@ -45,18 +20,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 

diff --git a/src/config/param.i386_fbsd_83.h b/src/config/param.i386_fbsd_83.h
index 9116291..dc538b8 100644 (file)
--- a/src/config/param.i386_fbsd_83.h
+++ b/src/config/param.i386_fbsd_83.h
@@ -10,35 +10,10 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -47,18 +22,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_84.h b/src/config/param.i386_fbsd_84.h
index 5e6eab9..541ab61 100644 (file)
--- a/src/config/param.i386_fbsd_84.h
+++ b/src/config/param.i386_fbsd_84.h
@@ -10,36 +10,11 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
 #define AFS_FBSD84_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -49,18 +24,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_90.h b/src/config/param.i386_fbsd_90.h
index c35cc24..3463910 100644 (file)
--- a/src/config/param.i386_fbsd_90.h
+++ b/src/config/param.i386_fbsd_90.h
@@ -10,37 +10,12 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
 #define AFS_FBSD84_ENV 1
 #define AFS_FBSD90_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -51,18 +26,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_91.h b/src/config/param.i386_fbsd_91.h
index 9ab6de4..35c9b72 100644 (file)
--- a/src/config/param.i386_fbsd_91.h
+++ b/src/config/param.i386_fbsd_91.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -30,18 +17,6 @@
 #define AFS_FBSD90_ENV 1
 #define AFS_FBSD91_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -53,18 +28,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_92.h b/src/config/param.i386_fbsd_92.h
index d084b58..8d2f531 100644 (file)
--- a/src/config/param.i386_fbsd_92.h
+++ b/src/config/param.i386_fbsd_92.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -31,18 +18,6 @@
 #define AFS_FBSD91_ENV 1
 #define AFS_FBSD92_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -55,18 +30,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/config/param.i386_fbsd_93.h b/src/config/param.i386_fbsd_93.h
index 39086a7..e62b96e 100644 (file)
--- a/src/config/param.i386_fbsd_93.h
+++ b/src/config/param.i386_fbsd_93.h
@@ -10,19 +10,6 @@
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */
 
-#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_FBSD72_ENV 1
-#define AFS_FBSD73_ENV 1
-#define AFS_FBSD74_ENV 1
-#define AFS_FBSD80_ENV 1
 #define AFS_FBSD81_ENV 1
 #define AFS_FBSD82_ENV 1
 #define AFS_FBSD83_ENV 1
@@ -32,18 +19,6 @@
 #define AFS_FBSD92_ENV 1
 #define AFS_FBSD93_ENV 1
 
-#define AFS_X86_FBSD50_ENV 1
-#define AFS_X86_FBSD51_ENV 1
-#define AFS_X86_FBSD52_ENV 1
-#define AFS_X86_FBSD53_ENV 1
-#define AFS_X86_FBSD60_ENV 1
-#define AFS_X86_FBSD61_ENV 1
-#define AFS_X86_FBSD62_ENV 1
-#define AFS_X86_FBSD70_ENV 1
-#define AFS_X86_FBSD71_ENV 1
-#define AFS_X86_FBSD72_ENV 1
-#define AFS_X86_FBSD74_ENV 1
-#define AFS_X86_FBSD80_ENV 1
 #define AFS_X86_FBSD81_ENV 1
 #define AFS_X86_FBSD82_ENV 1
 #define AFS_X86_FBSD83_ENV 1
@@ -57,18 +32,6 @@
 
 /* This section for user space compiles only */
 
-#define AFS_USR_FBSD50_ENV 1
-#define AFS_USR_FBSD51_ENV 1
-#define AFS_USR_FBSD52_ENV 1
-#define AFS_USR_FBSD53_ENV 1
-#define AFS_USR_FBSD60_ENV 1
-#define AFS_USR_FBSD61_ENV 1
-#define AFS_USR_FBSD62_ENV 1
-#define AFS_USR_FBSD70_ENV 1
-#define AFS_USR_FBSD71_ENV 1
-#define AFS_USR_FBSD72_ENV 1
-#define AFS_USR_FBSD73_ENV 1
-#define AFS_USR_FBSD80_ENV 1
 #define AFS_USR_FBSD81_ENV 1
 #define AFS_USR_FBSD82_ENV 1
 #define AFS_USR_FBSD83_ENV 1

diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c
index ecd6d8b..0c20017 100644 (file)
--- a/src/gtx/curseswindows.c
+++ b/src/gtx/curseswindows.c
@@ -20,7 +20,7 @@
 
 #include <roken.h>
 
-#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD80_ENV)
+#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV)
 #include <sgtty.h>
 #endif
 

diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index 2c910f5..67a11fd 100644 (file)
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@@ -18,7 +18,7 @@ CC = @CC@
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
 
-TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS)
+TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD_ENV $(XCFLAGS)
 TEST_LDFLAGS=
 TEST_LIBS=-lpthread
 

diff --git a/src/rx/FBSD/rx_kmutex.h b/src/rx/FBSD/rx_kmutex.h
index 660494c..a10b469 100644 (file)
--- a/src/rx/FBSD/rx_kmutex.h
+++ b/src/rx/FBSD/rx_kmutex.h
@@ -18,12 +18,8 @@
 
 #include <sys/systm.h>
 #include <sys/proc.h>
-#ifdef AFS_FBSD70_ENV
 #include <sys/lock.h>
 #include <sys/lockmgr.h>
-#else
-#include <sys/lock.h>
-#endif
 
 #define RX_ENABLE_LOCKS         1
 
@@ -58,11 +54,11 @@ typedef struct {
 
 #define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == curproc)
 
-#elif defined(AFS_FBSD70_ENV) /* dunno about 6.x */
+#else /* NULL_LOCKS */
 
 typedef struct mtx afs_kmutex_t;
 
-#if defined(AFS_FBSD80_ENV) && defined(WITNESS)
+#ifdef WITNESS
 #define WITCLEAR_MTX(a)                                        \
     do { memset((a), 0, sizeof(struct mtx)); } while(0)
 #else
@@ -96,42 +92,7 @@ typedef struct mtx afs_kmutex_t;
 #define MUTEX_ASSERT(a)                                \
     osi_Assert(mtx_owned((a)))
 
-#else
-
-typedef struct {
-    struct lock lock;
-    struct thread *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, curthread); \
-       osi_Assert((a)->owner == 0); \
-       (a)->owner = curthread; \
-    } while(0)
-#define MUTEX_TRYENTER(a) \
-    ( lockmgr(&(a)->lock, LK_EXCLUSIVE|LK_NOWAIT, 0, curthread) ? 0 : ((a)->owner = curthread, 1) )
-#define xMUTEX_TRYENTER(a) \
-    ( osi_Assert((a)->owner == 0), (a)->owner = curthread, 1)
-#define MUTEX_EXIT(a) \
-    do { \
-       osi_Assert((a)->owner == curthread); \
-       (a)->owner = 0; \
-       lockmgr(&(a)->lock, LK_RELEASE, 0, curthread); \
-    } while(0)
-
-#define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == curthread)
-#endif
+#endif /* !NULL_LOCKS */
 
 /*
  * Condition variables
@@ -143,8 +104,6 @@ typedef struct {
 #define CV_INIT(cv,a,b,c)
 #define CV_DESTROY(cv)
 
-#if defined(AFS_FBSD70_ENV)
-
 #define CV_WAIT(cv, lck)    { \
     int isGlockOwner = ISAFS_GLOCK();                                  \
     if (isGlockOwner) AFS_GUNLOCK();                                   \
@@ -158,26 +117,6 @@ typedef struct {
                                msleep(cv, lck, PSOCK, "afs_rx_cv_timedwait", t); \
                                if (isGlockOwner) AFS_GLOCK();  \
                                }
-#else /* !AFS_FBSD70_ENV */
-#define CV_WAIT(cv, lck)    { \
-                               int isGlockOwner = ISAFS_GLOCK(); \
-                               if (isGlockOwner) AFS_GUNLOCK();  \
-                               MUTEX_EXIT(lck);        \
-                               tsleep(cv, PSOCK, "afs_rx_cv_wait", 0);  \
-                               if (isGlockOwner) AFS_GLOCK();  \
-                               MUTEX_ENTER(lck); \
-                           }
-
-#define CV_TIMEDWAIT(cv,lck,t)  { \
-                               int isGlockOwner = ISAFS_GLOCK(); \
-                               if (isGlockOwner) AFS_GUNLOCK();  \
-                               MUTEX_EXIT(lck);        \
-                               tsleep(cv, PSOCK, "afs_rx_cv_timedwait", t); \
-                               if (isGlockOwner) AFS_GLOCK();  \
-                               MUTEX_ENTER(lck);       \
-                               }
-#endif /* AFS_FBSD80_ENV */
-
 #define CV_SIGNAL(cv)           wakeup_one(cv)
 #define CV_BROADCAST(cv)        wakeup(cv)
 

diff --git a/src/rx/rx.c b/src/rx/rx.c
index abeda0a..eac6733 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -2854,7 +2854,7 @@ rxi_Alloc(size_t size)
     }
 
 p = (char *)
-#if defined(KERNEL) && !defined(UKERNEL) && defined(AFS_FBSD80_ENV)
+#if defined(KERNEL) && !defined(UKERNEL) && defined(AFS_FBSD_ENV)
   afs_osi_Alloc_NoSleep(size);
 #else
   osi_Alloc(size);

diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index f5167ca..181d479 100644 (file)
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -658,7 +658,7 @@ rxi_GetIFInfo(void)
     }
 #else
 #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#if defined(AFS_FBSD80_ENV)
+#if defined(AFS_FBSD_ENV)
     CURVNET_SET(rx_socket->so_vnet);
     TAILQ_FOREACH(ifn, &V_ifnet, if_link) {
 #else
@@ -722,7 +722,7 @@ rxi_GetIFInfo(void)
        }
     }
 
-#ifdef AFS_FBSD80_ENV
+#ifdef AFS_FBSD_ENV
     CURVNET_RESTORE();
 #endif
 
@@ -738,7 +738,7 @@ rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp)
     rx_ifaddr_t ifad;
     rx_ifnet_t ret;
 
-#ifdef AFS_FBSD80_ENV
+#ifdef AFS_FBSD_ENV
     CURVNET_SET(rx_socket->so_vnet);
 #endif
 
@@ -753,7 +753,7 @@ rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp)
 
     ret = (ifad ? rx_ifaddr_ifnet(ifad) : NULL);
 
-#ifdef AFS_FBSD80_ENV
+#ifdef AFS_FBSD_ENV
     CURVNET_RESTORE();
 #endif
 

diff --git a/src/util/vice.h b/src/util/vice.h
index 1920a35..5342be7 100644 (file)
--- a/src/util/vice.h
+++ b/src/util/vice.h
@@ -12,7 +12,7 @@
 
 #include <sys/types.h>
 #if !defined(AFS_NT40_ENV)
-# if (!defined(AFS_FBSD80_ENV) && !defined(AFS_LINUX26_ENV)) || !defined(KERNEL) || defined(UKERNEL)
+# if (!defined(AFS_FBSD_ENV) && !defined(AFS_LINUX26_ENV)) || !defined(KERNEL) || defined(UKERNEL)
 #  include <sys/ioctl.h>
 # endif
 #endif /* AFS_NT40_ENV */