#define v_vfsp v_mount
/* vnode */
-#define SetAfsVnode(vn) /* nothing; done in getnewvnode() */
-#define IsAfsVnode(vn) ((vn)->v_op == afs_vnodeop_p)
-#define AFS_HOLD(vp) afs_nbsd_ref(vp)
-#define AFS_RELE(vp) afs_nbsd_rele(vp)
+#define SetAfsVnode(vn) /* nothing; done in getnewvnode() */
+#define IsAfsVnode(vn) ((vn)->v_op == afs_vnodeop_p)
#define VN_HOLD(vp) afs_vget((vp), 0)
+#define VN_RELE(vp) vrele(vp)
#define osi_vnhold(avc, r) afs_vget(AFSTOV(avc), 0)
#define va_nodeid va_fileid
#define vnode_t struct vnode
/* proc, cred */
#define AFS_PROC struct proc
#define AFS_UCRED ucred
-#define afs_suser() afs_osi_suser(osi_curcred())
+#define afs_suser(x) afs_osi_suser(osi_curcred())
#define getpid() curproc
#define osi_curcred() (curproc->p_cred->pc_ucred)
#define osi_curproc() curproc
#define osi_GetTime(x) microtime(x)
#define osi_Time() (time.tv_sec)
+/* str */
+#define afs_strcasecmp(s1, s2) strncasecmp((s1), (s2), 65535)
+#ifdef AFS_OBSD34_ENV
+#define strcpy(s1, s2) afs_strcpy((s1), (s2))
+#define strcat(s1, s2) afs_strcat((s1), (s2))
+#else
+#define afs_strcat(s1, s2) strcat((s1), (s2))
+#endif
+
/* other */
#define afs_bufferpages bufpages
+#ifndef iodone
+#define iodone biodone
+#endif
#define PAGESIZE 8192
#define printk printf /* for RX version of xdr_* */
#define setgroups sys_setgroups
/* This is not always in scope yet */
struct vcache;
-extern int afs_nbsd_lookupname(char *fnamep, enum uio_seg segflg, int followlink,
- struct vnode **dirvpp, struct vnode **compvpp);
+extern int afs_nbsd_lookupname(char *fnamep, enum uio_seg segflg,
+ int followlink, struct vnode **dirvpp,
+ struct vnode **compvpp);
extern void afs_nbsd_getnewvnode(struct vcache *tvc);
-extern void afs_nbsd_ref(struct vnode *);
-extern void afs_nbsd_rele(struct vnode *);
extern void *afs_nbsd_Alloc(size_t asize);
extern void afs_nbsd_Free(void *p, size_t asize);
extern int afs_vget();
afs_nbsd_lookupname((fnamep), (segflg), (followlink), (dirvpp), (compvpp))
#ifdef KERNEL
-extern int (**afs_vnodeop_p)();
+extern int (**afs_vnodeop_p) ();
#ifdef AFS_GLOBAL_SUNLOCK
-extern struct proc * afs_global_owner;
+extern struct proc *afs_global_owner;
extern struct lock afs_global_lock;
#define AFS_GLOCK() \
do { \