freebsd60-20050708

Fixes for FreeBSD 6.0 snap5.
Builds and runs but has locking issues.
This commit is contained in:
Jim Rees 2005-07-08 17:53:43 +00:00
parent 06e66a65c5
commit fbbb6db84c
4 changed files with 9 additions and 12 deletions

View File

@ -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);

View File

@ -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 */

View File

@ -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);

View File

@ -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)());