- Update to 1.6.6.

- Fix build on 10 or later.
- Add STAGEDIR support.
- Use USES=kmod.
- Use *_USES, CONFIGURE_OFF instead of PORT_OPTIONS:MFUSE.
- Use ${CFLAGS} for XCFLAGS.
- Style cleanups.

Approved by:	bjk (maintainer)
This commit is contained in:
Hiroki Sato 2014-02-18 03:50:18 +00:00
parent 2075fc9f3a
commit d83551b371
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=344833
21 changed files with 405 additions and 1689 deletions

View File

@ -2,8 +2,7 @@
PORTNAME= openafs
DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g}
PORTREVISION= 1
CATEGORIES= net kld
CATEGORIES= net
MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
http://dl.central.org/dl/cellservdb/:gco \
@ -22,17 +21,28 @@ LICENSE_NAME= IBM Public License Version 1.0
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
LICENSE_PERMS= auto-accept
AFS_DISTVERSION= 1.6.5
AFS_DISTVERSION= 1.6.6
DBVERSION= 2013-01-28
OPTIONS_DEFINE= FUSE
USES= kmod
USE_LDCONFIG= yes
PATCH_STRIP= -p1
USE_BZIP2= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--localstatedir=/var \
--mandir=${MANPREFIX}/man \
--with-bsd-kernel-headers=${SRC_BASE}/sys \
--with-bsd-kernel-build=${WRKDIR}/conf \
--enable-debug \
--enable-debug-kernel \
--enable-debug-lwp \
--includedir=${PREFIX}/include/openafs \
${CONFIGURE_TARGET}
WRKSRC= ${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION}
USE_RC_SUBR= afsd afsserver
CONFLICTS= coda-server-6.[0-9]* heimdal-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
AFSMNTDIR?= /afs
@ -50,13 +60,15 @@ PLIST_SUB+= AFSMNTDIR=${AFSMNTDIR:C,^/,,} \
# figure out what type of compiler is in use.
USES+= compiler
NO_STAGE= yes
OPTIONS_DEFINE= FUSE
FUSE_USES= fuse
OPTIONS_SUB= yes
FUSE_CONFIGURE_OFF= --disable-fuse-client
.include <bsd.port.pre.mk>
KERNCONF?= GENERIC
KERNCONFDIR?= ${SRC_BASE}/sys/${ARCH}/conf
KMODDIR= /boot/modules
PLIST_SUB+= KMODDIR=${KMODDIR:C,^/,,}
# Use the first component of ${KERNCONF}.
.for K in ${KERNCONF}
@ -71,39 +83,15 @@ IGNORE= requires kernel configuration file ${_KERNCONF} to build
IGNORE= supports FreeBSD 8.0 and later
.endif
CONFIGURE_ARGS= --prefix=${PREFIX} \
--localstatedir=/var \
--mandir=${MANPREFIX}/man \
--with-bsd-kernel-headers=${SRC_BASE}/sys \
--with-bsd-kernel-build=${WRKDIR}/conf \
--enable-debug \
--enable-debug-kernel \
--enable-debug-lwp \
--includedir=${PREFIX}/include/openafs \
${CONFIGURE_TARGET}
.if ${PORT_OPTIONS:MFUSE}
USES+= fuse
PLIST_SUB+= FUSE=""
.else
CONFIGURE_ARGS+= --disable-fuse-client
PLIST_SUB+= FUSE="@comment "
.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION}
CONFLICTS= coda-server-6.[0-9]* heimdal-[0-9]*
.include "Makefile.man"
# Do not show users the reminder about cleandepend and depend
post-extract:
${MKDIR} ${WRKDIR}/conf
cd ${KERNCONFDIR} && /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null
cd ${KERNCONFDIR} && \
/usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null
post-patch:
.if ${COMPILER_TYPE} == clang
${REINPLACE_CMD} -e 's/XCFLAGS="-O2 -pipe -fPIC"/XCFLAGS="-O2 -pipe -fPIC -mstackrealign"/' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's/XCFLAGS="-O2 -pipe -fPIC"/XCFLAGS="${CFLAGS} -fPIC -mstackrealign"/' ${WRKSRC}/configure
.endif
create-sample-files:
@ -112,17 +100,15 @@ create-sample-files:
@${INSTALL_DATA} ${DISTDIR}/CellServDB.${DBVERSION} ${WRKDIR}/CellServDB
post-install: create-sample-files
@${MKDIR} ${PREFIX}/etc/openafs
@${MKDIR} ${STAGEDIR}${ETCDIR}
.for F in CellServDB ThisCell cacheinfo
@${INSTALL_DATA} ${WRKDIR}/${F} ${PREFIX}/etc/openafs/${F}.sample
@if [ ! -e ${PREFIX}/etc/openafs/${F} ]; then \
${INSTALL_DATA} ${WRKDIR}/${F} ${PREFIX}/etc/openafs/${F}; \
fi
@${INSTALL_DATA} ${WRKDIR}/${F} ${STAGEDIR}${ETCDIR}/${F}.sample
.endfor
${INSTALL_KLD} ${PREFIX}/lib/openafs/libafs.ko ${KMODDIR}/
@${RM} ${PREFIX}/lib/openafs/libafs.ko
@${RMDIR} ${PREFIX}/lib/openafs
${MKDIR} ${AFSMNTDIR} ${AFSSTATEDIR} ${AFSCACHEDIR}
/usr/sbin/kldxref ${KMODDIR}
@${INSTALL_KLD} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko \
${STAGEDIR}${KMODDIR}
@${RM} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko
@${RMDIR} ${STAGEDIR}${PREFIX}/lib/openafs
${MKDIR} ${STAGEDIR}${AFSMNTDIR} \
${STAGEDIR}${AFSSTATEDIR} ${STAGEDIR}${AFSCACHEDIR}
.include <bsd.port.post.mk>

View File

@ -1,348 +0,0 @@
MAN1+= afs.1
MAN1+= afs_compile_et.1
MAN1+= afsmonitor.1
MAN1+= aklog.1
MAN1+= cmdebug.1
MAN1+= copyauth.1
MAN1+= dlog.1
MAN1+= fs.1
MAN1+= fs_apropos.1
MAN1+= fs_bypassthreshold.1
MAN1+= fs_checkservers.1
MAN1+= fs_checkvolumes.1
MAN1+= fs_chgrp.1
MAN1+= fs_chown.1
MAN1+= fs_cleanacl.1
MAN1+= fs_copyacl.1
MAN1+= fs_cscpolicy.1
MAN1+= fs_diskfree.1
MAN1+= fs_examine.1
MAN1+= fs_exportafs.1
MAN1+= fs_flush.1
MAN1+= fs_flushall.1
MAN1+= fs_flushmount.1
MAN1+= fs_flushvolume.1
MAN1+= fs_getcacheparms.1
MAN1+= fs_getcalleraccess.1
MAN1+= fs_getcellstatus.1
MAN1+= fs_getclientaddrs.1
MAN1+= fs_getcrypt.1
MAN1+= fs_getfid.1
MAN1+= fs_getserverprefs.1
MAN1+= fs_help.1
MAN1+= fs_listacl.1
MAN1+= fs_listaliases.1
MAN1+= fs_listcells.1
MAN1+= fs_listquota.1
MAN1+= fs_lsmount.1
MAN1+= fs_memdump.1
MAN1+= fs_messages.1
MAN1+= fs_minidump.1
MAN1+= fs_mkmount.1
MAN1+= fs_monitor.1
MAN1+= fs_newalias.1
MAN1+= fs_newcell.1
MAN1+= fs_quota.1
MAN1+= fs_rmmount.1
MAN1+= fs_rxstatpeer.1
MAN1+= fs_rxstatproc.1
MAN1+= fs_setacl.1
MAN1+= fs_setcachesize.1
MAN1+= fs_setcbaddr.1
MAN1+= fs_setcell.1
MAN1+= fs_setclientaddrs.1
MAN1+= fs_setcrypt.1
MAN1+= fs_setquota.1
MAN1+= fs_setserverprefs.1
MAN1+= fs_setvol.1
MAN1+= fs_storebehind.1
MAN1+= fs_sysname.1
MAN1+= fs_trace.1
MAN1+= fs_uuid.1
MAN1+= fs_whereis.1
MAN1+= fs_whichcell.1
MAN1+= fs_wscell.1
MAN1+= klog.1
MLINKS+= klog.1 klog.krb.1
MAN1+= klog.krb5.1
MAN1+= knfs.1
MAN1+= kpasswd.1
MAN1+= livesys.1
MAN1+= pagsh.1
MLINKS+= pagsh.1 pagsh.krb.1
MAN1+= pts.1
MAN1+= pts_adduser.1
MAN1+= pts_apropos.1
MAN1+= pts_chown.1
MAN1+= pts_creategroup.1
MAN1+= pts_createuser.1
MAN1+= pts_delete.1
MAN1+= pts_examine.1
MAN1+= pts_help.1
MAN1+= pts_interactive.1
MAN1+= pts_listentries.1
MAN1+= pts_listmax.1
MAN1+= pts_listowned.1
MAN1+= pts_membership.1
MAN1+= pts_quit.1
MAN1+= pts_removeuser.1
MAN1+= pts_rename.1
MAN1+= pts_setfields.1
MAN1+= pts_setmax.1
MAN1+= pts_sleep.1
MAN1+= pts_source.1
MAN1+= restorevol.1
MAN1+= rxdebug.1
MAN1+= rxgen.1
MAN1+= scout.1
MAN1+= symlink.1
MAN1+= symlink_list.1
MAN1+= symlink_make.1
MAN1+= symlink_remove.1
MAN1+= sys.1
MAN1+= tokens.1
MLINKS+= tokens.1 tokens.krb.1
MAN1+= translate_et.1
MAN1+= udebug.1
MAN1+= unlog.1
MAN1+= up.1
MAN1+= vos.1
MAN1+= vos_addsite.1
MAN1+= vos_apropos.1
MAN1+= vos_backup.1
MAN1+= vos_backupsys.1
MAN1+= vos_changeloc.1
MAN1+= vos_changeaddr.1
MAN1+= vos_clone.1
MAN1+= vos_convertROtoRW.1
MAN1+= vos_copy.1
MAN1+= vos_create.1
MAN1+= vos_delentry.1
MAN1+= vos_dump.1
MAN1+= vos_endtrans.1
MAN1+= vos_examine.1
MAN1+= vos_help.1
MAN1+= vos_listaddrs.1
MAN1+= vos_listpart.1
MAN1+= vos_listvldb.1
MAN1+= vos_listvol.1
MAN1+= vos_lock.1
MAN1+= vos_move.1
MAN1+= vos_offline.1
MAN1+= vos_online.1
MAN1+= vos_partinfo.1
MAN1+= vos_release.1
MAN1+= vos_remove.1
MAN1+= vos_remsite.1
MAN1+= vos_rename.1
MAN1+= vos_restore.1
MAN1+= vos_setaddrs.1
MAN1+= vos_setfields.1
MAN1+= vos_shadow.1
MAN1+= vos_size.1
MAN1+= vos_status.1
MAN1+= vos_syncserv.1
MAN1+= vos_syncvldb.1
MAN1+= vos_unlock.1
MAN1+= vos_unlockvldb.1
MAN1+= vos_zap.1
MAN1+= xstat_cm_test.1
MAN1+= xstat_fs_test.1
MAN5+= AuthLog.5
MAN5+= AuthLog.dir.5
MAN5+= BackupLog.5
MAN5+= BosConfig.5
MAN5+= BosLog.5
MAN5+= CellAlias.5
MAN5+= CellServDB.5
MAN5+= FORCESALVAGE.5
MAN5+= FileLog.5
MAN5+= KeyFile.5
MAN5+= krb.excl.5
MAN5+= NetInfo.5
MAN5+= NetRestrict.5
MAN5+= NoAuth.5
MAN5+= SALVAGE.fs.5
MAN5+= SalvageLog.5
MAN5+= ThisCell.5
MAN5+= UserList.5
MAN5+= VLLog.5
MAN5+= VolserLog.5
MAN5+= afs.5
MAN5+= afs_cache.5
MAN5+= afs_volume_header.5
MAN5+= afsmonitor.5
MAN5+= afszcm.cat.5
MAN5+= bdb.DB0.5
MAN5+= butc.5
MAN5+= butc_logs.5
MAN5+= cacheinfo.5
MAN5+= fms.log.5
MAN5+= kaserver.DB0.5
MAN5+= kaserverauxdb.5
MAN5+= krb.conf.5
MAN5+= prdb.DB0.5
MAN5+= salvage.lock.5
MAN5+= sysid.5
MAN5+= tapeconfig.5
MAN5+= uss.5
MAN5+= uss_bulk.5
MAN5+= vldb.DB0.5
MAN8+= afsd.8
.if ${PORT_OPTIONS:MFUSE}
MLINKS+= afsd.8 afsd.fuse.8
.endif
MAN8+= aklog_dynamic_auth.8
MAN8+= asetkey.8
MAN8+= backup.8
MAN8+= backup_adddump.8
MAN8+= backup_addhost.8
MAN8+= backup_addvolentry.8
MAN8+= backup_addvolset.8
MAN8+= backup_apropos.8
MAN8+= backup_dbverify.8
MAN8+= backup_deldump.8
MAN8+= backup_deletedump.8
MAN8+= backup_delhost.8
MAN8+= backup_delvolentry.8
MAN8+= backup_delvolset.8
MAN8+= backup_diskrestore.8
MAN8+= backup_dump.8
MAN8+= backup_dumpinfo.8
MAN8+= backup_help.8
MAN8+= backup_interactive.8
MAN8+= backup_jobs.8
MAN8+= backup_kill.8
MAN8+= backup_labeltape.8
MAN8+= backup_listdumps.8
MAN8+= backup_listhosts.8
MAN8+= backup_listvolsets.8
MAN8+= backup_quit.8
MAN8+= backup_readlabel.8
MAN8+= backup_restoredb.8
MAN8+= backup_savedb.8
MAN8+= backup_scantape.8
MAN8+= backup_setexp.8
MAN8+= backup_status.8
MAN8+= backup_volinfo.8
MAN8+= backup_volrestore.8
MAN8+= backup_volsetrestore.8
MAN8+= bos.8
MAN8+= bos_addhost.8
MAN8+= bos_addkey.8
MAN8+= bos_adduser.8
MAN8+= bos_apropos.8
MAN8+= bos_create.8
MAN8+= bos_delete.8
MAN8+= bos_exec.8
MAN8+= bos_getdate.8
MAN8+= bos_getlog.8
MAN8+= bos_getrestart.8
MAN8+= bos_getrestricted.8
MAN8+= bos_help.8
MAN8+= bos_install.8
MAN8+= bos_listhosts.8
MAN8+= bos_listkeys.8
MAN8+= bos_listusers.8
MAN8+= bos_prune.8
MAN8+= bos_removehost.8
MAN8+= bos_removekey.8
MAN8+= bos_removeuser.8
MAN8+= bos_restart.8
MAN8+= bos_salvage.8
MAN8+= bos_setauth.8
MAN8+= bos_setcellname.8
MAN8+= bos_setrestart.8
MAN8+= bos_setrestricted.8
MAN8+= bos_shutdown.8
MAN8+= bos_start.8
MAN8+= bos_startup.8
MAN8+= bos_status.8
MAN8+= bos_stop.8
MAN8+= bos_uninstall.8
MAN8+= bos_util.8
MAN8+= bosserver.8
MAN8+= buserver.8
MAN8+= butc.8
MAN8+= davolserver.8
MAN8+= dasalvager.8
MAN8+= dafileserver.8
MAN8+= dafssync-debug.8
MAN8+= fileserver.8
MAN8+= fms.8
MAN8+= fssync-debug_volop.8
MAN8+= fssync-debug_vnode.8
MAN8+= fssync-debug_vgcscanall.8
MAN8+= fssync-debug_vgcscan.8
MAN8+= fssync-debug_vgcquery.8
MAN8+= fssync-debug_vgcdel.8
MAN8+= fssync-debug_vgcadd.8
MAN8+= fssync-debug_stats.8
MAN8+= fssync-debug_query.8
MAN8+= fssync-debug_online.8
MAN8+= fssync-debug_offline.8
MAN8+= fssync-debug_move.8
MAN8+= fssync-debug_mode.8
MAN8+= fssync-debug_list.8
MAN8+= fssync-debug_leaveoff.8
MAN8+= fssync-debug_header.8
MAN8+= fssync-debug_error.8
MAN8+= fssync-debug_detach.8
MAN8+= fssync-debug_callback.8
MAN8+= fssync-debug_attach.8
MAN8+= fssync-debug.8
MAN8+= fstrace.8
MAN8+= fstrace_apropos.8
MAN8+= fstrace_clear.8
MAN8+= fstrace_dump.8
MAN8+= fstrace_help.8
MAN8+= fstrace_lslog.8
MAN8+= fstrace_lsset.8
MAN8+= fstrace_setlog.8
MAN8+= fstrace_setset.8
MAN8+= ka-forwarder.8
MAN8+= kadb_check.8
MAN8+= kas.8
MAN8+= kas_apropos.8
MAN8+= kas_create.8
MAN8+= kas_delete.8
MAN8+= kas_examine.8
MAN8+= kas_forgetticket.8
MAN8+= kas_help.8
MAN8+= kas_interactive.8
MAN8+= kas_list.8
MAN8+= kas_listtickets.8
MAN8+= kas_noauthentication.8
MAN8+= kas_quit.8
MAN8+= kas_setfields.8
MAN8+= kas_setpassword.8
MAN8+= kas_statistics.8
MAN8+= kdb.8
MAN8+= kas_stringtokey.8
MAN8+= kas_unlock.8
MAN8+= kaserver.8
MAN8+= kpwvalid.8
MAN8+= prdb_check.8
MAN8+= pt_util.8
MAN8+= ptserver.8
MAN8+= read_tape.8
MAN8+= rmtsysd.8
MAN8+= salvager.8
MAN8+= salvageserver.8
MAN8+= upclient.8
MAN8+= upserver.8
MAN8+= uss.8
MAN8+= uss_add.8
MAN8+= uss_apropos.8
MAN8+= uss_bulk.8
MAN8+= uss_delete.8
MAN8+= uss_help.8
MAN8+= vldb_check.8
MAN8+= vldb_convert.8
MAN8+= vlserver.8
MAN8+= voldump.8
MAN8+= volinfo.8
MAN8+= volserver.8
MAN8+= vsys.8
MAN8+= xfs_size_check.8
MAN8+= state_analyzer.8

View File

@ -1,6 +1,6 @@
SHA256 (openafs-1.6.5-src.tar.bz2) = 176fab2d710d8dcf566f5aa229fd796dd8165561d57590e32790a3034a195ef2
SIZE (openafs-1.6.5-src.tar.bz2) = 14400420
SHA256 (openafs-1.6.5-doc.tar.bz2) = 754ce1fd1c3b9026883453d5cde1705452568f4e54e86fbf02a75debf8f57f2f
SIZE (openafs-1.6.5-doc.tar.bz2) = 3488188
SHA256 (openafs-1.6.6-src.tar.bz2) = 635e3f236d10427d75257580303ed0d668226ed513fdf713ba5b81bf2131ca75
SIZE (openafs-1.6.6-src.tar.bz2) = 14582006
SHA256 (openafs-1.6.6-doc.tar.bz2) = 4c95031f6b8eed8ef340a3d293942f17d78b568584655c65d613265768e4d4fc
SIZE (openafs-1.6.6-doc.tar.bz2) = 3520366
SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17
SIZE (CellServDB.2013-01-28) = 36787

View File

@ -1,80 +0,0 @@
diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c
index 5fd9703..65f5333 100644
--- a/src/afs/FBSD/osi_vm.c
+++ b/src/afs/FBSD/osi_vm.c
@@ -29,13 +29,15 @@
#include "afs/afs_stats.h" /* statistics */
#include <vm/vm_object.h>
#include <vm/vm_map.h>
-#include <limits.h>
-#include <float.h>
+#include <sys/limits.h>
+#if __FreeBSD_version >= 1000030
+#include <sys/rwlock.h>
+#endif
/*
* FreeBSD implementation notes:
* Most of these operations require us to frob vm_objects. Most
- * functions require that the object be locked (with VM_OBJECT_LOCK)
+ * functions require that the object be locked (with VM_OBJECT_*LOCK)
* on entry and leave it locked on exit. The locking protocol
* requires that we access vp->v_object with the heavy vnode lock
* held and the vnode interlock unlocked.
@@ -58,6 +60,14 @@
#define islocked_vnode(v) VOP_ISLOCKED((v), curthread)
#endif
+#if __FreeBSD_version >= 1000030
+#define AFS_VM_OBJECT_WLOCK(o) VM_OBJECT_WLOCK(o)
+#define AFS_VM_OBJECT_WUNLOCK(o) VM_OBJECT_WUNLOCK(o)
+#else
+#define AFS_VM_OBJECT_WLOCK(o) VM_OBJECT_LOCK(o)
+#define AFS_VM_OBJECT_WUNLOCK(o) VM_OBJECT_UNLOCK(o)
+#endif
+
/* Try to discard pages, in order to recycle a vcache entry.
*
* We also make some sanity checks: ref count, open count, held locks.
@@ -155,9 +165,9 @@ osi_VM_StoreAllSegments(struct vcache *avc)
if (!vget(vp, LK_EXCLUSIVE | LK_RETRY, curthread)) {
obj = vp->v_object;
if (obj != NULL) {
- VM_OBJECT_LOCK(obj);
+ AFS_VM_OBJECT_WLOCK(obj);
vm_object_page_clean(obj, 0, 0, OBJPC_SYNC);
- VM_OBJECT_UNLOCK(obj);
+ AFS_VM_OBJECT_WUNLOCK(obj);
anyio = 1;
}
vput(vp);
@@ -203,7 +213,7 @@ osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync)
lock_vnode(vp, LK_EXCLUSIVE);
if (vp->v_bufobj.bo_object != NULL) {
- VM_OBJECT_LOCK(vp->v_bufobj.bo_object);
+ AFS_VM_OBJECT_WLOCK(vp->v_bufobj.bo_object);
/*
* Do we really want OBJPC_SYNC? OBJPC_INVAL would be
* faster, if invalidation is really what we are being
@@ -219,7 +229,7 @@ osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync)
*/
vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC);
- VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
+ AFS_VM_OBJECT_WUNLOCK(vp->v_bufobj.bo_object);
}
tries = 5;
@@ -249,9 +259,9 @@ osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp)
ASSERT_VOP_LOCKED(vp, __func__);
obj = vp->v_object;
if (obj != NULL) {
- VM_OBJECT_LOCK(obj);
+ AFS_VM_OBJECT_WLOCK(obj);
vm_object_page_remove(obj, 0, 0, FALSE);
- VM_OBJECT_UNLOCK(obj);
+ AFS_VM_OBJECT_WUNLOCK(obj);
}
osi_vinvalbuf(vp, 0, 0, 0);
}

View File

@ -1,123 +0,0 @@
diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 01498fa..ac16df0 100644
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -54,6 +54,9 @@
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/unistd.h>
+#if __FreeBSD_version >= 1000030
+#include <sys/rwlock.h>
+#endif
#include <vm/vm_page.h>
#include <vm/vm_object.h>
#include <vm/vm_pager.h>
@@ -266,6 +269,14 @@ static __inline void ma_vm_page_unlock(vm_page_t m) {};
#define MA_PCPU_ADD(c, n) (c) += (n)
#endif
+#if __FreeBSD_version >= 1000030
+#define AFS_VM_OBJECT_WLOCK(o) VM_OBJECT_WLOCK(o)
+#define AFS_VM_OBJECT_WUNLOCK(o) VM_OBJECT_WUNLOCK(o)
+#else
+#define AFS_VM_OBJECT_WLOCK(o) VM_OBJECT_LOCK(o)
+#define AFS_VM_OBJECT_WUNLOCK(o) VM_OBJECT_UNLOCK(o)
+#endif
+
#ifdef AFS_FBSD70_ENV
#ifndef AFS_FBSD80_ENV
/* From kern_lock.c */
@@ -806,7 +817,7 @@ afs_vop_getpages(struct vop_getpages_args *ap)
{
vm_page_t m = ap->a_m[ap->a_reqpage];
- VM_OBJECT_LOCK(object);
+ AFS_VM_OBJECT_WLOCK(object);
ma_vm_page_lock_queues();
if (m->valid != 0) {
/* handled by vm_fault now */
@@ -819,11 +830,11 @@ afs_vop_getpages(struct vop_getpages_args *ap)
}
}
ma_vm_page_unlock_queues();
- VM_OBJECT_UNLOCK(object);
+ AFS_VM_OBJECT_WUNLOCK(object);
return (0);
}
ma_vm_page_unlock_queues();
- VM_OBJECT_UNLOCK(object);
+ AFS_VM_OBJECT_WUNLOCK(object);
}
bp = getpbuf(&afs_pbuf_freecnt);
@@ -851,19 +862,19 @@ afs_vop_getpages(struct vop_getpages_args *ap)
relpbuf(bp, &afs_pbuf_freecnt);
if (code && (uio.uio_resid == ap->a_count)) {
- VM_OBJECT_LOCK(object);
+ AFS_VM_OBJECT_WLOCK(object);
ma_vm_page_lock_queues();
for (i = 0; i < npages; ++i) {
if (i != ap->a_reqpage)
vm_page_free(ap->a_m[i]);
}
ma_vm_page_unlock_queues();
- VM_OBJECT_UNLOCK(object);
+ AFS_VM_OBJECT_WUNLOCK(object);
return VM_PAGER_ERROR;
}
size = ap->a_count - uio.uio_resid;
- VM_OBJECT_LOCK(object);
+ AFS_VM_OBJECT_WLOCK(object);
ma_vm_page_lock_queues();
for (i = 0, toff = 0; i < npages; i++, toff = nextoff) {
vm_page_t m;
@@ -893,6 +904,9 @@ afs_vop_getpages(struct vop_getpages_args *ap)
}
if (i != ap->a_reqpage) {
+#if __FreeBSD_version >= 1000042
+ vm_page_readahead_finish(m);
+#else
/*
* Whether or not to leave the page activated is up in
* the air, but we should put the page on a page queue
@@ -926,10 +940,11 @@ afs_vop_getpages(struct vop_getpages_args *ap)
vm_page_free(m);
ma_vm_page_unlock(m);
}
+#endif /* __FreeBSD_version 1000042 */
}
}
ma_vm_page_unlock_queues();
- VM_OBJECT_UNLOCK(object);
+ AFS_VM_OBJECT_WUNLOCK(object);
return 0;
}
@@ -1076,24 +1091,6 @@ afs_vop_poll(ap)
return (1);
}
-/*
- * Mmap a file
- *
- * NB Currently unsupported.
- */
-/* ARGSUSED */
-int
-afs_vop_mmap(ap)
- struct vop_mmap_args /* {
- * struct vnode *a_vp;
- * int a_fflags;
- * struct ucred *a_cred;
- * struct thread *td;
- * } */ *ap;
-{
- return (EINVAL);
-}
-
int
afs_vop_fsync(ap)
struct vop_fsync_args /* {

View File

@ -1,31 +0,0 @@
diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 63fe88f..e0a744d 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -815,9 +815,15 @@ afs_xioctl(afs_proc_t *p, struct ioctl_args *uap, register_t *retval)
# else
fdp = p->p_fd;
#endif
+#if defined(AFS_FBSD100_ENV)
+ if ((uap->fd >= fdp->fd_nfiles)
+ || ((fd = fdp->fd_ofiles[uap->fd].fde_file) == NULL))
+ return EBADF;
+#else
if ((u_int) uap->fd >= fdp->fd_nfiles
|| (fd = fdp->fd_ofiles[uap->fd]) == NULL)
return EBADF;
+#endif
if ((fd->f_flag & (FREAD | FWRITE)) == 0)
return EBADF;
/* first determine whether this is any sort of vnode */
@@ -1118,10 +1124,6 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow)
vp = (struct vnode *)dp->d_inode;
#else
code = gop_lookupname_user(path, AFS_UIOUSER, follow, &vp);
-#if defined(AFS_FBSD80_ENV) /* XXX check on 7x */
- if (vp != NULL)
- VN_HOLD(vp);
-#endif /* AFS_FBSD80_ENV */
#endif /* AFS_LINUX22_ENV */
#endif /* AFS_AIX41_ENV */
AFS_GLOCK();

View File

@ -1,13 +0,0 @@
diff --git a/src/afs/afs_warn.c b/src/afs/afs_warn.c
index d8bdddc..a04a98b 100644
--- a/src/afs/afs_warn.c
+++ b/src/afs/afs_warn.c
@@ -25,6 +25,8 @@
# include <net/if.h>
# if defined(AFS_SUN58_ENV)
# include <sys/varargs.h>
+# elif defined(AFS_FBSD_ENV)
+# include <machine/stdarg.h>
# else
# include <stdarg.h>
# endif

View File

@ -1,13 +1,17 @@
diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 5840227..9d68b1e 100644
index 3e3a172..10343b8 100644
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -288,7 +288,7 @@ typedef unsigned short etap_event_t;
# include "h/protosw.h"
@@ -202,6 +202,12 @@ typedef unsigned short etap_event_t;
# include "h/systm.h"
# include "h/time.h"
# if defined(AFS_FBSD_ENV)
-# include "limits.h"
+# include "sys/limits.h"
# endif
# ifdef AFS_HPUX_ENV
+# ifdef AFS_FBSD_ENV
+# include <sys/socket.h>
+# include <net/if.h>
+# include <net/if_var.h>
+# endif
+
# ifdef AFS_AIX_ENV
# ifdef AFS_AIX41_ENV
# include "sys/statfs.h"

View File

@ -1,10 +0,0 @@
--- a/src/budb/Makefile.in 2013-06-19 16:52:25.000000000 -0400
+++ b/src/budb/Makefile.in 2013-06-19 16:53:06.000000000 -0400
@@ -80,6 +80,7 @@
database.o: database.c budb_errs.h globals.h ${INCLS}
db_alloc.o: db_alloc.c budb_errs.h ${INCLS}
+db_dump.o: dbs_dump.c budb_errs.h ${INCLS}
dbs_dump.o: dbs_dump.c budb_errs.h ${INCLS}
db_lock.o: db_lock.c budb_errs.h ${INCLS}
db_text.o: db_text.c budb_errs.h ${INCLS}

View File

@ -1,24 +0,0 @@
diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index 060795b..2a7e993 100644
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -209,7 +209,9 @@
#define SYS_NAME_ID_i386_fbsd_84 2123
#define SYS_NAME_ID_i386_fbsd_90 2120
#define SYS_NAME_ID_i386_fbsd_91 2122
+#define SYS_NAME_ID_i386_fbsd_92 2124
#define SYS_NAME_ID_i386_fbsd_100 2130
+#define SYS_NAME_ID_i386_fbsd_110 2140
#define SYS_NAME_ID_ia64_linux2 2200
#define SYS_NAME_ID_ia64_linux22 2201
@@ -310,7 +312,9 @@
#define SYS_NAME_ID_amd64_fbsd_84 3015
#define SYS_NAME_ID_amd64_fbsd_90 3020
#define SYS_NAME_ID_amd64_fbsd_91 3022
+#define SYS_NAME_ID_amd64_fbsd_92 3023
#define SYS_NAME_ID_amd64_fbsd_100 3030
+#define SYS_NAME_ID_amd64_fbsd_110 3040
#define SYS_NAME_ID_amd64_w2k 3400

View File

@ -1,224 +0,0 @@
diff --git a/src/config/param.amd64_fbsd_110.h b/src/config/param.amd64_fbsd_110.h
new file mode 100644
index 0000000..2e55c67
--- /dev/null
+++ b/src/config/param.amd64_fbsd_110.h
@@ -0,0 +1,218 @@
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* Machine / Operating system information */
+#define SYS_NAME "amd64_fbsd_110"
+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_110
+
+#define AFSLITTLE_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+
+
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV 1
+
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BIT_CLIENT 1
+#define AFS_64BITPOINTER_ENV 1
+#define AFS_64BITUSERPOINTER_ENV 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_FBSD_ENV 1
+#define AFS_FBSD50_ENV 1
+#define AFS_FBSD51_ENV 1
+#define AFS_FBSD52_ENV 1
+#define AFS_FBSD53_ENV 1
+#define AFS_FBSD60_ENV 1
+#define AFS_FBSD61_ENV 1
+#define AFS_FBSD62_ENV 1
+#define AFS_FBSD70_ENV 1
+#define AFS_FBSD71_ENV 1
+#define AFS_FBSD80_ENV 1
+#define AFS_FBSD81_ENV 1
+#define AFS_FBSD90_ENV 1
+#define AFS_FBSD91_ENV 1
+#define AFS_FBSD100_ENV 1
+#define AFS_FBSD110_ENV 1
+#define AFS_X86_FBSD_ENV 1
+#define AFS_X86_FBSD50_ENV 1
+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
+#define AFS_X86_FBSD62_ENV 1
+#define AFS_X86_FBSD70_ENV 1
+#define AFS_X86_FBSD71_ENV 1
+#define AFS_X86_FBSD80_ENV 1
+#define AFS_X86_FBSD81_ENV 1
+#define AFS_X86_FBSD90_ENV 1
+#define AFS_X86_FBSD91_ENV 1
+#define AFS_X86_FBSD100_ENV 1
+#define AFS_X86_FBSD110_ENV 1
+#define AFS_X86_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+#define FTRUNC O_TRUNC
+
+#define IUPD 0x0010
+#define IACC 0x0020
+#define ICHG 0x0040
+#define IMOD 0x0080
+
+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
+ NULL, curproc)
+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
+ NULL, curproc)
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_VFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_GREEDY43_ENV 1
+#define AFS_ENV 1
+
+#define AFS_SYSCALL 339
+#define AFS_MOUNT_AFS "afs"
+
+#ifndef MOUNT_UFS
+#define MOUNT_UFS "ufs"
+#endif
+
+#ifndef MOUNT_AFS
+#define MOUNT_AFS AFS_MOUNT_AFS
+#endif
+
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#define AFS_GLOBAL_SUNLOCK 1
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define AFS_SHORTGID 0 /* are group id's short? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES CLBYTES
+#define osi_GetTime(x) microtime(x)
+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
+#undef AFS_KALLOC_NOSLEEP
+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
+#define AFS_KFREE(x,y) osi_fbsd_free((x))
+#define v_count v_usecount
+#define v_vfsp v_mount
+#define vfs_bsize mnt_stat.f_bsize
+#define vfs_fsid mnt_stat.f_fsid
+#define va_nodeid va_fileid
+#define vfs_vnodecovered mnt_vnodecovered
+#define direct dirent
+#define vnode_t struct vnode
+
+#ifndef MUTEX_DEFAULT
+#define MUTEX_DEFAULT 0
+#endif /* MUTEX_DEFAULT */
+
+#ifndef SSYS
+#define SSYS 0x00002
+#endif /* SSYS */
+
+#define p_rcred p_ucred
+
+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#define UKERNEL 1 /* user space kernel */
+#define AFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_USR_FBSD50_ENV 1
+#define AFS_USR_FBSD51_ENV 1
+#define AFS_USR_FBSD52_ENV 1
+#define AFS_USR_FBSD53_ENV 1
+#define AFS_USR_FBSD60_ENV 1
+#define AFS_USR_FBSD61_ENV 1
+#define AFS_USR_FBSD70_ENV 1
+#define AFS_USR_FBSD71_ENV 1
+#define AFS_USR_FBSD80_ENV 1
+#define AFS_USR_FBSD81_ENV 1
+#define AFS_USR_FBSD90_ENV 1
+#define AFS_USR_FBSD91_ENV 1
+#define AFS_USR_FBSD100_ENV 1
+#define AFS_USR_FBSD110_ENV 1
+#define AFS_USR_FBSD_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 339
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BITPOINTER_ENV 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+#include <afs/afs_sysnames.h>
+
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_fmode uio_fmode
+#define afsio_resid uio_resid
+#define AFS_UIOSYS 1
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES MCLBYTES
+#define AFS_MINCHANGE 2
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#endif /* !defined(UKERNEL) */
+
+/* general user-space compiles */
+
+#if defined(UKERNEL) || !defined(KERNEL)
+#define STDLIB_HAS_MALLOC_PROTOS 1
+#endif
+
+#endif /* AFS_PARAM_H */

View File

@ -1,221 +0,0 @@
diff --git a/src/config/param.amd64_fbsd_92.h b/src/config/param.amd64_fbsd_92.h
new file mode 100644
index 0000000..b16c83d
--- /dev/null
+++ b/src/config/param.amd64_fbsd_92.h
@@ -0,0 +1,215 @@
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* Machine / Operating system information */
+#define SYS_NAME "amd64_fbsd_92"
+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_92
+
+#define AFSLITTLE_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+
+
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV 1
+
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BIT_CLIENT 1
+#define AFS_64BITPOINTER_ENV 1
+#define AFS_64BITUSERPOINTER_ENV 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_FBSD_ENV 1
+#define AFS_FBSD50_ENV 1
+#define AFS_FBSD51_ENV 1
+#define AFS_FBSD52_ENV 1
+#define AFS_FBSD53_ENV 1
+#define AFS_FBSD60_ENV 1
+#define AFS_FBSD61_ENV 1
+#define AFS_FBSD62_ENV 1
+#define AFS_FBSD70_ENV 1
+#define AFS_FBSD71_ENV 1
+#define AFS_FBSD80_ENV 1
+#define AFS_FBSD81_ENV 1
+#define AFS_FBSD90_ENV 1
+#define AFS_FBSD91_ENV 1
+#define AFS_FBSD92_ENV 1
+#define AFS_X86_FBSD_ENV 1
+#define AFS_X86_FBSD50_ENV 1
+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
+#define AFS_X86_FBSD62_ENV 1
+#define AFS_X86_FBSD70_ENV 1
+#define AFS_X86_FBSD71_ENV 1
+#define AFS_X86_FBSD80_ENV 1
+#define AFS_X86_FBSD81_ENV 1
+#define AFS_X86_FBSD90_ENV 1
+#define AFS_X86_FBSD91_ENV 1
+#define AFS_X86_FBSD92_ENV 1
+#define AFS_X86_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+#define FTRUNC O_TRUNC
+
+#define IUPD 0x0010
+#define IACC 0x0020
+#define ICHG 0x0040
+#define IMOD 0x0080
+
+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
+ NULL, curproc)
+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
+ NULL, curproc)
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_VFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_GREEDY43_ENV 1
+#define AFS_ENV 1
+
+#define AFS_SYSCALL 339
+#define AFS_MOUNT_AFS "afs"
+
+#ifndef MOUNT_UFS
+#define MOUNT_UFS "ufs"
+#endif
+
+#ifndef MOUNT_AFS
+#define MOUNT_AFS AFS_MOUNT_AFS
+#endif
+
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#define AFS_GLOBAL_SUNLOCK 1
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define AFS_SHORTGID 0 /* are group id's short? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES CLBYTES
+#define osi_GetTime(x) microtime(x)
+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
+#undef AFS_KALLOC_NOSLEEP
+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
+#define AFS_KFREE(x,y) osi_fbsd_free((x))
+#define v_count v_usecount
+#define v_vfsp v_mount
+#define vfs_bsize mnt_stat.f_bsize
+#define vfs_fsid mnt_stat.f_fsid
+#define va_nodeid va_fileid
+#define vfs_vnodecovered mnt_vnodecovered
+#define direct dirent
+#define vnode_t struct vnode
+
+#ifndef MUTEX_DEFAULT
+#define MUTEX_DEFAULT 0
+#endif /* MUTEX_DEFAULT */
+
+#ifndef SSYS
+#define SSYS 0x00002
+#endif /* SSYS */
+
+#define p_rcred p_ucred
+
+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#define UKERNEL 1 /* user space kernel */
+#define AFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_USR_FBSD50_ENV 1
+#define AFS_USR_FBSD51_ENV 1
+#define AFS_USR_FBSD52_ENV 1
+#define AFS_USR_FBSD53_ENV 1
+#define AFS_USR_FBSD60_ENV 1
+#define AFS_USR_FBSD61_ENV 1
+#define AFS_USR_FBSD70_ENV 1
+#define AFS_USR_FBSD71_ENV 1
+#define AFS_USR_FBSD80_ENV 1
+#define AFS_USR_FBSD81_ENV 1
+#define AFS_USR_FBSD90_ENV 1
+#define AFS_USR_FBSD91_ENV 1
+#define AFS_USR_FBSD92_ENV 1
+#define AFS_USR_FBSD_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 339
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BITPOINTER_ENV 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+#include <afs/afs_sysnames.h>
+
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_fmode uio_fmode
+#define afsio_resid uio_resid
+#define AFS_UIOSYS 1
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES MCLBYTES
+#define AFS_MINCHANGE 2
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#endif /* !defined(UKERNEL) */
+
+/* general user-space compiles */
+
+#if defined(UKERNEL) || !defined(KERNEL)
+#define STDLIB_HAS_MALLOC_PROTOS 1
+#endif
+
+#endif /* AFS_PARAM_H */

View File

@ -1,222 +0,0 @@
diff --git a/src/config/param.i386_fbsd_110.h b/src/config/param.i386_fbsd_110.h
new file mode 100644
index 0000000..622e7f1
--- /dev/null
+++ b/src/config/param.i386_fbsd_110.h
@@ -0,0 +1,216 @@
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* Machine / Operating system information */
+#define SYS_NAME "i386_fbsd_110"
+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_110
+
+#define AFSLITTLE_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */
+
+
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV 1
+
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BIT_CLIENT 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_FBSD_ENV 1
+#define AFS_FBSD50_ENV 1
+#define AFS_FBSD51_ENV 1
+#define AFS_FBSD52_ENV 1
+#define AFS_FBSD53_ENV 1
+#define AFS_FBSD60_ENV 1
+#define AFS_FBSD61_ENV 1
+#define AFS_FBSD62_ENV 1
+#define AFS_FBSD70_ENV 1
+#define AFS_FBSD71_ENV 1
+#define AFS_FBSD80_ENV 1
+#define AFS_FBSD81_ENV 1
+#define AFS_FBSD90_ENV 1
+#define AFS_FBSD91_ENV 1
+#define AFS_FBSD100_ENV 1
+#define AFS_FBSD110_ENV 1
+#define AFS_X86_FBSD_ENV 1
+#define AFS_X86_FBSD50_ENV 1
+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
+#define AFS_X86_FBSD62_ENV 1
+#define AFS_X86_FBSD70_ENV 1
+#define AFS_X86_FBSD71_ENV 1
+#define AFS_X86_FBSD80_ENV 1
+#define AFS_X86_FBSD81_ENV 1
+#define AFS_X86_FBSD90_ENV 1
+#define AFS_X86_FBSD91_ENV 1
+#define AFS_X86_FBSD100_ENV 1
+#define AFS_X86_FBSD110_ENV 1
+#define AFS_X86_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+#define FTRUNC O_TRUNC
+
+#define IUPD 0x0010
+#define IACC 0x0020
+#define ICHG 0x0040
+#define IMOD 0x0080
+
+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
+ NULL, curproc)
+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
+ NULL, curproc)
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_VFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_GREEDY43_ENV 1
+#define AFS_ENV 1
+
+#define AFS_SYSCALL 339
+#define AFS_MOUNT_AFS "afs"
+
+#ifndef MOUNT_UFS
+#define MOUNT_UFS "ufs"
+#endif
+
+#ifndef MOUNT_AFS
+#define MOUNT_AFS AFS_MOUNT_AFS
+#endif
+
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#define AFS_GLOBAL_SUNLOCK 1
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define AFS_SHORTGID 0 /* are group id's short? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES CLBYTES
+#define osi_GetTime(x) microtime(x)
+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
+#undef AFS_KALLOC_NOSLEEP
+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
+#define AFS_KFREE(x,y) osi_fbsd_free((x))
+#define v_count v_usecount
+#define v_vfsp v_mount
+#define vfs_bsize mnt_stat.f_bsize
+#define vfs_fsid mnt_stat.f_fsid
+#define va_nodeid va_fileid
+#define vfs_vnodecovered mnt_vnodecovered
+#define direct dirent
+#define vnode_t struct vnode
+
+#ifndef MUTEX_DEFAULT
+#define MUTEX_DEFAULT 0
+#endif /* MUTEX_DEFAULT */
+
+#ifndef SSYS
+#define SSYS 0x00002
+#endif /* SSYS */
+
+#define p_rcred p_ucred
+
+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#define UKERNEL 1 /* user space kernel */
+#define AFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_USR_FBSD50_ENV 1
+#define AFS_USR_FBSD51_ENV 1
+#define AFS_USR_FBSD52_ENV 1
+#define AFS_USR_FBSD53_ENV 1
+#define AFS_USR_FBSD60_ENV 1
+#define AFS_USR_FBSD61_ENV 1
+#define AFS_USR_FBSD70_ENV 1
+#define AFS_USR_FBSD71_ENV 1
+#define AFS_USR_FBSD80_ENV 1
+#define AFS_USR_FBSD81_ENV 1
+#define AFS_USR_FBSD90_ENV 1
+#define AFS_USR_FBSD91_ENV 1
+#define AFS_USR_FBSD100_ENV 1
+#define AFS_USR_FBSD110_ENV 1
+#define AFS_USR_FBSD_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 339
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+#include <afs/afs_sysnames.h>
+
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_fmode uio_fmode
+#define afsio_resid uio_resid
+#define AFS_UIOSYS 1
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES MCLBYTES
+#define AFS_MINCHANGE 2
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#endif /* !defined(UKERNEL) */
+
+/* general user-space compiles */
+
+#if defined(UKERNEL) || !defined(KERNEL)
+#define STDLIB_HAS_MALLOC_PROTOS 1
+#endif
+
+#endif /* AFS_PARAM_H */

View File

@ -1,219 +0,0 @@
diff --git a/src/config/param.i386_fbsd_92.h b/src/config/param.i386_fbsd_92.h
new file mode 100644
index 0000000..7941bde
--- /dev/null
+++ b/src/config/param.i386_fbsd_92.h
@@ -0,0 +1,213 @@
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+/* Machine / Operating system information */
+#define SYS_NAME "i386_fbsd_92"
+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_92
+
+#define AFSLITTLE_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 1 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */
+
+
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV 1
+
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BIT_CLIENT 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_FBSD_ENV 1
+#define AFS_FBSD50_ENV 1
+#define AFS_FBSD51_ENV 1
+#define AFS_FBSD52_ENV 1
+#define AFS_FBSD53_ENV 1
+#define AFS_FBSD60_ENV 1
+#define AFS_FBSD61_ENV 1
+#define AFS_FBSD62_ENV 1
+#define AFS_FBSD70_ENV 1
+#define AFS_FBSD71_ENV 1
+#define AFS_FBSD80_ENV 1
+#define AFS_FBSD81_ENV 1
+#define AFS_FBSD90_ENV 1
+#define AFS_FBSD91_ENV 1
+#define AFS_FBSD92_ENV 1
+#define AFS_X86_FBSD_ENV 1
+#define AFS_X86_FBSD50_ENV 1
+#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
+#define AFS_X86_FBSD62_ENV 1
+#define AFS_X86_FBSD70_ENV 1
+#define AFS_X86_FBSD71_ENV 1
+#define AFS_X86_FBSD80_ENV 1
+#define AFS_X86_FBSD81_ENV 1
+#define AFS_X86_FBSD90_ENV 1
+#define AFS_X86_FBSD91_ENV 1
+#define AFS_X86_FBSD92_ENV 1
+#define AFS_X86_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+#define FTRUNC O_TRUNC
+
+#define IUPD 0x0010
+#define IACC 0x0020
+#define ICHG 0x0040
+#define IMOD 0x0080
+
+#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
+ NULL, curproc)
+#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \
+ NULL, curproc)
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_VFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_GREEDY43_ENV 1
+#define AFS_ENV 1
+
+#define AFS_SYSCALL 339
+#define AFS_MOUNT_AFS "afs"
+
+#ifndef MOUNT_UFS
+#define MOUNT_UFS "ufs"
+#endif
+
+#ifndef MOUNT_AFS
+#define MOUNT_AFS AFS_MOUNT_AFS
+#endif
+
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#define AFS_GLOBAL_SUNLOCK 1
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define AFS_SHORTGID 0 /* are group id's short? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES CLBYTES
+#define osi_GetTime(x) microtime(x)
+#define AFS_KALLOC(x) osi_fbsd_alloc((x), 1)
+#undef AFS_KALLOC_NOSLEEP
+#define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
+#define AFS_KFREE(x,y) osi_fbsd_free((x))
+#define v_count v_usecount
+#define v_vfsp v_mount
+#define vfs_bsize mnt_stat.f_bsize
+#define vfs_fsid mnt_stat.f_fsid
+#define va_nodeid va_fileid
+#define vfs_vnodecovered mnt_vnodecovered
+#define direct dirent
+#define vnode_t struct vnode
+
+#ifndef MUTEX_DEFAULT
+#define MUTEX_DEFAULT 0
+#endif /* MUTEX_DEFAULT */
+
+#ifndef SSYS
+#define SSYS 0x00002
+#endif /* SSYS */
+
+#define p_rcred p_ucred
+
+#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#define UKERNEL 1 /* user space kernel */
+#define AFS_ENV 1
+#define AFS_VFSINCL_ENV 1
+#define AFS_USR_FBSD50_ENV 1
+#define AFS_USR_FBSD51_ENV 1
+#define AFS_USR_FBSD52_ENV 1
+#define AFS_USR_FBSD53_ENV 1
+#define AFS_USR_FBSD60_ENV 1
+#define AFS_USR_FBSD61_ENV 1
+#define AFS_USR_FBSD70_ENV 1
+#define AFS_USR_FBSD71_ENV 1
+#define AFS_USR_FBSD80_ENV 1
+#define AFS_USR_FBSD81_ENV 1
+#define AFS_USR_FBSD90_ENV 1
+#define AFS_USR_FBSD91_ENV 1
+#define AFS_USR_FBSD92_ENV 1
+#define AFS_USR_FBSD_ENV 1
+#undef AFS_NONFSTRANS
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 339
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#define AFS_64BIT_ENV 1
+#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+#include <afs/afs_sysnames.h>
+
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_fmode uio_fmode
+#define afsio_resid uio_resid
+#define AFS_UIOSYS 1
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES MCLBYTES
+#define AFS_MINCHANGE 2
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <limits.h>
+
+#endif /* !defined(UKERNEL) */
+
+/* general user-space compiles */
+
+#if defined(UKERNEL) || !defined(KERNEL)
+#define STDLIB_HAS_MALLOC_PROTOS 1
+#endif
+
+#endif /* AFS_PARAM_H */

View File

@ -1,31 +0,0 @@
diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index efc5f9b..92461c9 100644
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -42,9 +42,7 @@ KOPTS = -fPIC -mno-red-zone
KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
-elf \
-<i386_fbsd_60>
-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
-<all>
-mno-align-long-strings -fno-common -ffreestanding \
-I${KBLD} -include opt_global.h -fno-strict-aliasing
@@ -72,15 +70,11 @@ setup:
-$(RM) -f h net netinet rpc ufs nfs machine sys vm
-ln -fs ${KSRC}/net net
<amd64 i386>
- -ln -fs ${KSRC}/x86/include machine
+ -ln -fs ${KSRC}/x86/include x86
<all>
-ln -fs ${KSRC}/netinet netinet
-ln -fs ${KSRC}/nfs nfs
-<fbsd_50 fbsd_51 fbsd_52 fbsd_53 fbsd_60 fbsd_61 fbsd_62 fbsd_70>
- -ln -fs /usr/include/rpc rpc
-<all -fbsd_50 -fbsd_51 -fbsd_52 -fbsd_53 -fbsd_60 -fbsd_61 -fbsd_62 -fbsd_70>
-ln -fs ${KSRC}/rpc rpc
-<all>
-ln -fs ${KSRC}/sys sys
-ln -fs ${KSRC}/ufs/ufs ufs
-ln -fs ${KSRC}/sys h

View File

@ -1,16 +0,0 @@
diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index 642fe6a..33f0c48 100644
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@@ -23,11 +23,7 @@ OPTF=-O
TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS)
TEST_LDFLAGS=
-<fbsd_50 fbsd_51 fbsd_52 fbsd_53 fbsd_60 fbsd_61>
-TEST_LIBS=-lc_r
-<all -fbsd_50 -fbsd_51 -fbsd_52 -fbsd_53 -fbsd_60 -fbsd_61>
TEST_LIBS=-lpthread
-<all>
LIBUAFS = libuafs.a
LIBJUAFS = libjuafs.a

View File

@ -1,13 +0,0 @@
diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h
index 2bdc0b8..0810432 100644
--- a/src/rx/rx_clock.h
+++ b/src/rx/rx_clock.h
@@ -92,7 +92,7 @@ extern int clock_nUpdates;
#if defined(AFS_SGI61_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL)
#define clock_GetTime(cv) osi_GetTime((osi_timeval_t *)cv)
#else
-#if (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)) || (defined(AFS_DARWIN100_ENV) && defined(__amd64__)) || defined(AFS_NBSD_ENV)
+#if (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)) || (defined(AFS_DARWIN100_ENV) && defined(__amd64__)) || defined(AFS_XBSD_ENV)
#define clock_GetTime(cv) \
BEGIN \
struct timeval tv; \

View File

@ -1,17 +1,16 @@
diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 64d03cb..58bf69c 100644
index 9b04123..92752db 100644
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -141,7 +141,11 @@ typedef unsigned short etap_event_t;
#include "h/errno.h"
#if !(defined(AFS_SUN5_ENV) && defined(KERNEL))
/* if sys/systm.h includes varargs.h some versions of solaris have conflicts */
-#include "stdarg.h"
+# if defined(AFS_FBSD_ENV)
+# include "machine/stdarg.h"
+# else
+# include "stdarg.h"
@@ -124,6 +124,11 @@ typedef unsigned short etap_event_t;
#include "h/file.h"
#endif
#include "net/if.h"
+# ifdef AFS_FBSD_ENV
+# include <sys/socket.h>
+# include <net/if.h>
+# include <net/if_var.h>
+# endif
#endif
#ifdef KERNEL
#include "afs/sysincludes.h"
#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h"

View File

@ -1,11 +0,0 @@
--- a/src/tbudb/Makefile.in 2013-06-19 16:52:31.000000000 -0400
+++ b/src/tbudb/Makefile.in 2013-06-19 16:54:02.000000000 -0400
@@ -122,7 +122,7 @@
db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS}
${CCRULE} ${srcdir}/${BUDB}/db_alloc.c
-db_dump.o: ${BUDB}/db_dump.c
+db_dump.o: ${BUDB}/db_dump.c budb_errs.h ${INCLS}
${CCRULE} ${srcdir}/${BUDB}/db_dump.c
dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS}

View File

@ -1,31 +0,0 @@
--- openafs-1.6.1/src/volser/Makefile.in.orig 2012-03-27 08:03:34.000000000 +0900
+++ openafs-1.6.1/src/volser/Makefile.in 2012-06-24 09:14:53.000000000 +0900
@@ -15,7 +15,7 @@
VINCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \
- ${TOP_INCDIR}/afs/vlserver.h vol.h dump.h volser.h lockdata.h \
+ ${TOP_INCDIR}/afs/vlserver.h vol.h dump.h volser.h volint.h lockdata.h \
voltrans_inline.h
RINCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
@@ -85,7 +85,7 @@
${TOP_LIBDIR}/libvolser.a: libvolser.a
${INSTALL_DATA} $? $@
-restorevol: restorevol.c
+restorevol: restorevol.c volint.h
${CC} ${CFLAGS} -o restorevol ${srcdir}/restorevol.c \
${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS}
@@ -135,8 +135,9 @@
vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
volmain.o: volmain.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
+voltrans.o: voltrans.c ${VINCLS}
dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS}
-voldump.o: voldump.c ${VINCLS} ${RINCLS}
+vol-dump.o: vol-dump.c ${VINCLS} ${RINCLS}
vos.o: vos.c ${VINCLS} ${RINCLS} ${INTINCLS} AFS_component_version_number.c
vsprocs.o: vsprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
physio.o: physio.c ${VINCLS}

View File

@ -250,6 +250,352 @@ sbin/fstrace
sbin/state_analyzer
sbin/salvsync-debug
sbin/fssync-debug
man/man1/afs.1.gz
man/man1/afs_compile_et.1.gz
man/man1/afsmonitor.1.gz
man/man1/aklog.1.gz
man/man1/cmdebug.1.gz
man/man1/copyauth.1.gz
man/man1/dlog.1.gz
man/man1/fs.1.gz
man/man1/fs_apropos.1.gz
man/man1/fs_bypassthreshold.1.gz
man/man1/fs_checkservers.1.gz
man/man1/fs_checkvolumes.1.gz
man/man1/fs_chgrp.1.gz
man/man1/fs_chown.1.gz
man/man1/fs_cleanacl.1.gz
man/man1/fs_copyacl.1.gz
man/man1/fs_cscpolicy.1.gz
man/man1/fs_diskfree.1.gz
man/man1/fs_examine.1.gz
man/man1/fs_exportafs.1.gz
man/man1/fs_flush.1.gz
man/man1/fs_flushall.1.gz
man/man1/fs_flushmount.1.gz
man/man1/fs_flushvolume.1.gz
man/man1/fs_getcacheparms.1.gz
man/man1/fs_getcalleraccess.1.gz
man/man1/fs_getcellstatus.1.gz
man/man1/fs_getclientaddrs.1.gz
man/man1/fs_getcrypt.1.gz
man/man1/fs_getfid.1.gz
man/man1/fs_getserverprefs.1.gz
man/man1/fs_help.1.gz
man/man1/fs_listacl.1.gz
man/man1/fs_listaliases.1.gz
man/man1/fs_listcells.1.gz
man/man1/fs_listquota.1.gz
man/man1/fs_lsmount.1.gz
man/man1/fs_memdump.1.gz
man/man1/fs_messages.1.gz
man/man1/fs_minidump.1.gz
man/man1/fs_mkmount.1.gz
man/man1/fs_monitor.1.gz
man/man1/fs_newalias.1.gz
man/man1/fs_newcell.1.gz
man/man1/fs_quota.1.gz
man/man1/fs_rmmount.1.gz
man/man1/fs_rxstatpeer.1.gz
man/man1/fs_rxstatproc.1.gz
man/man1/fs_setacl.1.gz
man/man1/fs_setcachesize.1.gz
man/man1/fs_setcbaddr.1.gz
man/man1/fs_setcell.1.gz
man/man1/fs_setclientaddrs.1.gz
man/man1/fs_setcrypt.1.gz
man/man1/fs_setquota.1.gz
man/man1/fs_setserverprefs.1.gz
man/man1/fs_setvol.1.gz
man/man1/fs_storebehind.1.gz
man/man1/fs_sysname.1.gz
man/man1/fs_trace.1.gz
man/man1/fs_uuid.1.gz
man/man1/fs_whereis.1.gz
man/man1/fs_whichcell.1.gz
man/man1/fs_wscell.1.gz
man/man1/klog.1.gz
man/man1/klog.krb.1.gz
man/man1/klog.krb5.1.gz
man/man1/knfs.1.gz
man/man1/kpasswd.1.gz
man/man1/livesys.1.gz
man/man1/pagsh.1.gz
man/man1/pagsh.krb.1.gz
man/man1/pts.1.gz
man/man1/pts_adduser.1.gz
man/man1/pts_apropos.1.gz
man/man1/pts_chown.1.gz
man/man1/pts_creategroup.1.gz
man/man1/pts_createuser.1.gz
man/man1/pts_delete.1.gz
man/man1/pts_examine.1.gz
man/man1/pts_help.1.gz
man/man1/pts_interactive.1.gz
man/man1/pts_listentries.1.gz
man/man1/pts_listmax.1.gz
man/man1/pts_listowned.1.gz
man/man1/pts_membership.1.gz
man/man1/pts_quit.1.gz
man/man1/pts_removeuser.1.gz
man/man1/pts_rename.1.gz
man/man1/pts_setfields.1.gz
man/man1/pts_setmax.1.gz
man/man1/pts_sleep.1.gz
man/man1/pts_source.1.gz
man/man1/restorevol.1.gz
man/man1/rxdebug.1.gz
man/man1/rxgen.1.gz
man/man1/scout.1.gz
man/man1/symlink.1.gz
man/man1/symlink_list.1.gz
man/man1/symlink_make.1.gz
man/man1/symlink_remove.1.gz
man/man1/sys.1.gz
man/man1/tokens.1.gz
man/man1/tokens.krb.1.gz
man/man1/translate_et.1.gz
man/man1/udebug.1.gz
man/man1/unlog.1.gz
man/man1/up.1.gz
man/man1/vos.1.gz
man/man1/vos_addsite.1.gz
man/man1/vos_apropos.1.gz
man/man1/vos_backup.1.gz
man/man1/vos_backupsys.1.gz
man/man1/vos_changeaddr.1.gz
man/man1/vos_changeloc.1.gz
man/man1/vos_clone.1.gz
man/man1/vos_convertROtoRW.1.gz
man/man1/vos_copy.1.gz
man/man1/vos_create.1.gz
man/man1/vos_delentry.1.gz
man/man1/vos_dump.1.gz
man/man1/vos_endtrans.1.gz
man/man1/vos_examine.1.gz
man/man1/vos_help.1.gz
man/man1/vos_listaddrs.1.gz
man/man1/vos_listpart.1.gz
man/man1/vos_listvldb.1.gz
man/man1/vos_listvol.1.gz
man/man1/vos_lock.1.gz
man/man1/vos_move.1.gz
man/man1/vos_offline.1.gz
man/man1/vos_online.1.gz
man/man1/vos_partinfo.1.gz
man/man1/vos_release.1.gz
man/man1/vos_remove.1.gz
man/man1/vos_remsite.1.gz
man/man1/vos_rename.1.gz
man/man1/vos_restore.1.gz
man/man1/vos_setaddrs.1.gz
man/man1/vos_setfields.1.gz
man/man1/vos_shadow.1.gz
man/man1/vos_size.1.gz
man/man1/vos_status.1.gz
man/man1/vos_syncserv.1.gz
man/man1/vos_syncvldb.1.gz
man/man1/vos_unlock.1.gz
man/man1/vos_unlockvldb.1.gz
man/man1/vos_zap.1.gz
man/man1/xstat_cm_test.1.gz
man/man1/xstat_fs_test.1.gz
man/man5/AuthLog.5.gz
man/man5/AuthLog.dir.5.gz
man/man5/BackupLog.5.gz
man/man5/BosConfig.5.gz
man/man5/BosLog.5.gz
man/man5/CellAlias.5.gz
man/man5/CellServDB.5.gz
man/man5/FORCESALVAGE.5.gz
man/man5/FileLog.5.gz
man/man5/KeyFile.5.gz
man/man5/NetInfo.5.gz
man/man5/NetRestrict.5.gz
man/man5/NoAuth.5.gz
man/man5/SALVAGE.fs.5.gz
man/man5/SalvageLog.5.gz
man/man5/ThisCell.5.gz
man/man5/UserList.5.gz
man/man5/VLLog.5.gz
man/man5/VolserLog.5.gz
man/man5/afs.5.gz
man/man5/afs_cache.5.gz
man/man5/afs_volume_header.5.gz
man/man5/afsmonitor.5.gz
man/man5/afszcm.cat.5.gz
man/man5/bdb.DB0.5.gz
man/man5/butc.5.gz
man/man5/butc_logs.5.gz
man/man5/cacheinfo.5.gz
man/man5/fms.log.5.gz
man/man5/kaserver.DB0.5.gz
man/man5/kaserverauxdb.5.gz
man/man5/krb.conf.5.gz
man/man5/krb.excl.5.gz
man/man5/prdb.DB0.5.gz
man/man5/salvage.lock.5.gz
man/man5/sysid.5.gz
man/man5/tapeconfig.5.gz
man/man5/uss.5.gz
man/man5/uss_bulk.5.gz
man/man5/vldb.DB0.5.gz
man/man8/afsd.8.gz
%%FUSE%%man/man8/afsd.fuse.8.gz
man/man8/aklog_dynamic_auth.8.gz
man/man8/asetkey.8.gz
man/man8/backup.8.gz
man/man8/backup_adddump.8.gz
man/man8/backup_addhost.8.gz
man/man8/backup_addvolentry.8.gz
man/man8/backup_addvolset.8.gz
man/man8/backup_apropos.8.gz
man/man8/backup_dbverify.8.gz
man/man8/backup_deldump.8.gz
man/man8/backup_deletedump.8.gz
man/man8/backup_delhost.8.gz
man/man8/backup_delvolentry.8.gz
man/man8/backup_delvolset.8.gz
man/man8/backup_diskrestore.8.gz
man/man8/backup_dump.8.gz
man/man8/backup_dumpinfo.8.gz
man/man8/backup_help.8.gz
man/man8/backup_interactive.8.gz
man/man8/backup_jobs.8.gz
man/man8/backup_kill.8.gz
man/man8/backup_labeltape.8.gz
man/man8/backup_listdumps.8.gz
man/man8/backup_listhosts.8.gz
man/man8/backup_listvolsets.8.gz
man/man8/backup_quit.8.gz
man/man8/backup_readlabel.8.gz
man/man8/backup_restoredb.8.gz
man/man8/backup_savedb.8.gz
man/man8/backup_scantape.8.gz
man/man8/backup_setexp.8.gz
man/man8/backup_status.8.gz
man/man8/backup_volinfo.8.gz
man/man8/backup_volrestore.8.gz
man/man8/backup_volsetrestore.8.gz
man/man8/bos.8.gz
man/man8/bos_addhost.8.gz
man/man8/bos_addkey.8.gz
man/man8/bos_adduser.8.gz
man/man8/bos_apropos.8.gz
man/man8/bos_create.8.gz
man/man8/bos_delete.8.gz
man/man8/bos_exec.8.gz
man/man8/bos_getdate.8.gz
man/man8/bos_getlog.8.gz
man/man8/bos_getrestart.8.gz
man/man8/bos_getrestricted.8.gz
man/man8/bos_help.8.gz
man/man8/bos_install.8.gz
man/man8/bos_listhosts.8.gz
man/man8/bos_listkeys.8.gz
man/man8/bos_listusers.8.gz
man/man8/bos_prune.8.gz
man/man8/bos_removehost.8.gz
man/man8/bos_removekey.8.gz
man/man8/bos_removeuser.8.gz
man/man8/bos_restart.8.gz
man/man8/bos_salvage.8.gz
man/man8/bos_setauth.8.gz
man/man8/bos_setcellname.8.gz
man/man8/bos_setrestart.8.gz
man/man8/bos_setrestricted.8.gz
man/man8/bos_shutdown.8.gz
man/man8/bos_start.8.gz
man/man8/bos_startup.8.gz
man/man8/bos_status.8.gz
man/man8/bos_stop.8.gz
man/man8/bos_uninstall.8.gz
man/man8/bos_util.8.gz
man/man8/bosserver.8.gz
man/man8/buserver.8.gz
man/man8/butc.8.gz
man/man8/dafileserver.8.gz
man/man8/dafssync-debug.8.gz
man/man8/dasalvager.8.gz
man/man8/davolserver.8.gz
man/man8/fileserver.8.gz
man/man8/fms.8.gz
man/man8/fssync-debug.8.gz
man/man8/fssync-debug_attach.8.gz
man/man8/fssync-debug_callback.8.gz
man/man8/fssync-debug_detach.8.gz
man/man8/fssync-debug_error.8.gz
man/man8/fssync-debug_header.8.gz
man/man8/fssync-debug_leaveoff.8.gz
man/man8/fssync-debug_list.8.gz
man/man8/fssync-debug_mode.8.gz
man/man8/fssync-debug_move.8.gz
man/man8/fssync-debug_offline.8.gz
man/man8/fssync-debug_online.8.gz
man/man8/fssync-debug_query.8.gz
man/man8/fssync-debug_stats.8.gz
man/man8/fssync-debug_vgcadd.8.gz
man/man8/fssync-debug_vgcdel.8.gz
man/man8/fssync-debug_vgcquery.8.gz
man/man8/fssync-debug_vgcscan.8.gz
man/man8/fssync-debug_vgcscanall.8.gz
man/man8/fssync-debug_vnode.8.gz
man/man8/fssync-debug_volop.8.gz
man/man8/fstrace.8.gz
man/man8/fstrace_apropos.8.gz
man/man8/fstrace_clear.8.gz
man/man8/fstrace_dump.8.gz
man/man8/fstrace_help.8.gz
man/man8/fstrace_lslog.8.gz
man/man8/fstrace_lsset.8.gz
man/man8/fstrace_setlog.8.gz
man/man8/fstrace_setset.8.gz
man/man8/ka-forwarder.8.gz
man/man8/kadb_check.8.gz
man/man8/kas.8.gz
man/man8/kas_apropos.8.gz
man/man8/kas_create.8.gz
man/man8/kas_delete.8.gz
man/man8/kas_examine.8.gz
man/man8/kas_forgetticket.8.gz
man/man8/kas_help.8.gz
man/man8/kas_interactive.8.gz
man/man8/kas_list.8.gz
man/man8/kas_listtickets.8.gz
man/man8/kas_noauthentication.8.gz
man/man8/kas_quit.8.gz
man/man8/kas_setfields.8.gz
man/man8/kas_setpassword.8.gz
man/man8/kas_statistics.8.gz
man/man8/kas_stringtokey.8.gz
man/man8/kas_unlock.8.gz
man/man8/kaserver.8.gz
man/man8/kdb.8.gz
man/man8/kpwvalid.8.gz
man/man8/prdb_check.8.gz
man/man8/pt_util.8.gz
man/man8/ptserver.8.gz
man/man8/read_tape.8.gz
man/man8/rmtsysd.8.gz
man/man8/salvager.8.gz
man/man8/salvageserver.8.gz
man/man8/state_analyzer.8.gz
man/man8/upclient.8.gz
man/man8/upserver.8.gz
man/man8/uss.8.gz
man/man8/uss_add.8.gz
man/man8/uss_apropos.8.gz
man/man8/uss_bulk.8.gz
man/man8/uss_delete.8.gz
man/man8/uss_help.8.gz
man/man8/vldb_check.8.gz
man/man8/vldb_convert.8.gz
man/man8/vlserver.8.gz
man/man8/voldump.8.gz
man/man8/volinfo.8.gz
man/man8/volserver.8.gz
man/man8/vsys.8.gz
man/man8/xfs_size_check.8.gz
@unexec if cmp -s %D/etc/openafs/CellServDB.sample %D/etc/openafs/CellServDB ; then rm %D/etc/openafs/CellServDB ; fi
etc/openafs/CellServDB.sample
@exec if [ ! -e %D/etc/openafs/CellServDB ] ; then cp %D/etc/openafs/CellServDB.sample %D/etc/openafs/CellServDB ; fi
@ -269,8 +615,6 @@ etc/openafs/cacheinfo.sample
@dirrm %%DATADIR%%
@cwd /
%%KMODDIR%%/libafs.ko
@exec /usr/sbin/kldxref /%%KMODDIR%%
@unexec /usr/sbin/kldxref /%%KMODDIR%%
@exec /bin/mkdir -p %D/%%AFSMNTDIR%% %D/%%AFSSTATEDIR%% %D/%%AFSCACHEDIR%%
@dirrmtry %%AFSMNTDIR%%
@dirrmtry %%AFSCACHEDIR%%