PATCH: Arla CVS Current on OpenBSD 4.3

[Bo Brantén]

diff -cr arla-cvs/nnpfs/bsd/nnpfs/nnpfs_node.h arla-new/nnpfs/bsd/nnpfs/nnpfs_node.h
*** arla-cvs/nnpfs/bsd/nnpfs/nnpfs_node.h	2007-03-06 17:01:56.000000000 +0100
--- arla-new/nnpfs/bsd/nnpfs/nnpfs_node.h	2008-10-23 18:50:53.000000000 +0200
***************
*** 113,119 ****

   #else

! #if defined(__FreeBSD__) && __FreeBSD_version >= 600000
   #define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, bar)
   #else
   #define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, foo, bar)
--- 113,119 ----

   #else

! #if (defined(__FreeBSD__) && __FreeBSD_version >= 600000 || defined(__OpenBSD__))
   #define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, bar)
   #else
   #define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, foo, bar)
diff -cr arla-cvs/nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h arla-new/nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h
*** arla-cvs/nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h	2008-02-26 22:59:18.000000000 +0100
--- arla-new/nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h	2008-10-23 19:48:01.000000000 +0200
***************
*** 79,85 ****
   nnpfs_root(struct mount *mp, struct vnode **vpp);

   int
! #ifdef HAVE_VFS_QUOTACTL_CADDR
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p);
   #else
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p);
--- 79,85 ----
   nnpfs_root(struct mount *mp, struct vnode **vpp);

   int
! #if (defined(HAVE_VFS_QUOTACTL_CADDR) || defined (__OpenBSD__))
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p);
   #else
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p);
diff -cr arla-cvs/nnpfs/bsd/nnpfs_blocks.c arla-new/nnpfs/bsd/nnpfs_blocks.c
*** arla-cvs/nnpfs/bsd/nnpfs_blocks.c	2008-02-27 23:16:21.000000000 +0100
--- arla-new/nnpfs/bsd/nnpfs_blocks.c	2008-10-23 18:44:04.000000000 +0200
***************
*** 469,476 ****

   #ifdef __FreeBSD__
   	    (void)vn_start_write(cachedir, &mp, V_WAIT); /* V_NOWAIT? */
- #endif
   	    VOP_LEASE(cachedir, p, cred, LEASE_WRITE);
   	    error = VOP_CREATE(cachedir, vpp, &nd.ni_cnd, &vat);

   #ifdef __FreeBSD__
--- 469,476 ----

   #ifdef __FreeBSD__
   	    (void)vn_start_write(cachedir, &mp, V_WAIT); /* V_NOWAIT? */
   	    VOP_LEASE(cachedir, p, cred, LEASE_WRITE);
+ #endif
   	    error = VOP_CREATE(cachedir, vpp, &nd.ni_cnd, &vat);

   #ifdef __FreeBSD__
diff -cr arla-cvs/nnpfs/bsd/nnpfs_vfsops-bsd.c arla-new/nnpfs/bsd/nnpfs_vfsops-bsd.c
*** arla-cvs/nnpfs/bsd/nnpfs_vfsops-bsd.c	2008-02-26 22:59:11.000000000 +0100
--- arla-new/nnpfs/bsd/nnpfs_vfsops-bsd.c	2008-10-23 19:47:20.000000000 +0200
***************
*** 84,90 ****
   }

   int
! #ifdef HAVE_VFS_QUOTACTL_CADDR
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p)
   #else
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p)
--- 84,90 ----
   }

   int
! #if (defined(HAVE_VFS_QUOTACTL_CADDR) || defined (__OpenBSD__))
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p)
   #else
   nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p)
diff -cr arla-cvs/nnpfs/bsd/nnpfs_vnodeops-bsd.c arla-new/nnpfs/bsd/nnpfs_vnodeops-bsd.c
*** arla-cvs/nnpfs/bsd/nnpfs_vnodeops-bsd.c	2008-02-27 23:14:34.000000000 +0100
--- arla-new/nnpfs/bsd/nnpfs_vnodeops-bsd.c	2008-10-23 19:59:00.000000000 +0200
***************
*** 902,908 ****
--- 902,912 ----
       ret = lockmgr(l, flags, &vp->v_interlock, NNPFS_AP_PROC(ap));
   #endif
   #else
+ #ifndef __OpenBSD__
       ret = lockmgr(l, flags, &vp->v_interlock);
+ #else
+     ret = lockmgr(l, flags, NULL);
+ #endif
   #endif
   #else
       ret = debuglockmgr(l, flags, &vp->v_interlock, NNPFS_AP_PROC(ap),
***************
*** 948,954 ****
--- 952,962 ----
       ret = lockmgr (l, flags | LK_RELEASE, &vp->v_interlock, NNPFS_AP_PROC(ap));
   #endif
   #else
+ #ifndef __OpenBSD__
       ret = lockmgr (l, flags | LK_RELEASE, &vp->v_interlock);
+ #else
+     ret = lockmgr (l, flags | LK_RELEASE, NULL);
+ #endif
   #endif
   #else
       ret = debuglockmgr (l, flags | LK_RELEASE, &vp->v_interlock, NNPFS_AP_PROC(ap),
diff -cr arla-cvs/nnpfs/bsd/nnpfs_vnodeops-common.c arla-new/nnpfs/bsd/nnpfs_vnodeops-common.c
*** arla-cvs/nnpfs/bsd/nnpfs_vnodeops-common.c	2008-02-26 22:59:13.000000000 +0100
--- arla-new/nnpfs/bsd/nnpfs_vnodeops-common.c	2008-10-23 19:54:31.000000000 +0200
***************
*** 1440,1448 ****
       int error = 0;
       nnpfs_cred cred;
       struct nnpfs *nnpfsp = NNPFS_FROM_VNODE(vp);
- #ifdef HAVE_THREE_ARGUMENT_VOP_UNLOCK
       d_thread_t *proc = nnpfs_vfs_context_proc(ctx);
- #endif

       NNPFSDEB(XDEBVNOPS, ("nnpfs_readlink\n"));

--- 1440,1446 ----