STABLE14-freebsd60-20050708

Fixes for FreeBSD 6.0 snap5.
Builds and runs but has locking issues.

(cherry picked from commit fbbb6db84c85061bd010df068485927b1a3a628f)

diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c
index 16cdf5d33946c0fc206c958d6344ea5af026b00d..de477b95e819a95459780ced466bbcfd3e3e217e 100644 (file)
--- a/src/afs/FBSD/osi_vfsops.c
+++ b/src/afs/FBSD/osi_vfsops.c
@@ -155,7 +155,9 @@ afs_unmount(struct mount *mp, int flags, THREAD_OR_PROC)
 }
 
 int
-#ifdef AFS_FBSD53_ENV
+#if 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)
@@ -224,7 +226,7 @@ tryagain:
        *vpp = vp;
     }
 
-    afs_Trace2(afs_iclSetp, CM_TRACE_VFSROOT, ICL_TYPE_POINTER, *vpp,
+    afs_Trace2(afs_iclSetp, CM_TRACE_VFSROOT, ICL_TYPE_POINTER, tvp ? AFSTOV(tvp) : NULL,
               ICL_TYPE_INT32, error);
     AFS_GUNLOCK();
     crfree(cr);

diff --git a/src/dir/dir.c b/src/dir/dir.c
index 22bd3f31d4ef0336d3b89b90bfbfe36545356ee2..252a71717206f5681f95437beb2fb50cd991ff40 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -25,24 +25,16 @@ RCSID
 #include "h/errno.h"
 #endif
 #include "h/time.h"
-#if defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV)
 #include "h/errno.h"
 #else
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV)
 #include "h/kernel.h"
 #endif
 #endif
-#if    defined(AFS_SUN56_ENV) || defined(AFS_HPUX_ENV)
+#if    defined(AFS_SUN56_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_FBSD_ENV)
 #include "afs/sysincludes.h"
 #endif
-#if defined(AFS_FBSD_ENV)
-#include "h/libkern.h"
-#include "h/lock.h"
-#include "vm/vm.h"
-#include "vm/vm_extern.h"
-#include "vm/pmap.h"
-#include "vm/vm_map.h"
-#endif /* AFS_FBSD_ENV */
 #if !defined(AFS_SGI64_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "h/user.h"
 #endif /* AFS_SGI64_ENV */

diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h
index af7d88995829834aaf727efa13b4c489758a7bad..fbfc35f4068b6d904918fdf8489dafa360406f41 100644 (file)
--- a/src/util/afsutil_prototypes.h
+++ b/src/util/afsutil_prototypes.h
@@ -101,6 +101,8 @@ extern void psignal(unsigned int sig, char *s);
 extern int util_isint(char *str);
 
 /* kreltime.c */
+struct ktime;
+struct ktime_date;
 extern afs_int32 ktimeRelDate_ToInt32(struct ktime_date *kdptr);
 extern int Int32To_ktimeRelDate(afs_int32 int32Date,
                                struct ktime_date *kdptr);

diff --git a/src/volser/volser.p.h b/src/volser/volser.p.h
index c55ab064dc653477987e38ec4c4edc4f39bad389..9e5b015c7cff4b79ed66e575b0cd2d9e7052abe6 100644 (file)
--- a/src/volser/volser.p.h
+++ b/src/volser/volser.p.h
@@ -170,6 +170,7 @@ struct partList {           /*used by the backup system */
 #define RV_NOVLDB      0x40000
 #define RV_NOCLONE     0x80000
 
+struct ubik_client;
 extern afs_uint32 vsu_GetVolumeID(char *astring, struct ubik_client *acstruct, afs_int32 *errp);
 extern int vsu_ExtractName(char rname[], char name[]);
 extern afs_int32 vsu_ClientInit(int noAuthFlag, char *confDir, char *cellName, afs_int32 sauth, struct ubik_client **uclientp, int (*secproc)());