Re: PATCH: Arla 0.90 on OpenBSD 4.3

There was one function missing (nnpfs_dev_msleep) in my last patch for 
Arla 0.90 on OpenBSD 4.3, here is a new patch that has been tested to work 
well, the patch for current CVS version was correct before.

diff -cr arla-0.90/nnpfs/bsd/nnpfs/nnpfs_node.h arla-0.90-new/nnpfs/bsd/nnpfs/nnpfs_node.h
*** arla-0.90/nnpfs/bsd/nnpfs/nnpfs_node.h	2006-10-24 18:33:19.000000000 +0200
--- arla-0.90-new/nnpfs/bsd/nnpfs/nnpfs_node.h	2008-10-22 22:53:28.000000000 +0200
***************
*** 114,120 ****
   #else

   #define nnpfs_vrele(vp) vrele(vp)
! #define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, foo, bar)
   #define nnpfs_vput(vp) vput(vp)
   #define nnpfs_vref(vp) VREF(vp)
   #define nnpfs_vletgo(vn) nnpfs_vrele(vn)
--- 114,120 ----
   #else

   #define nnpfs_vrele(vp) vrele(vp)
! #define nnpfs_vrecycle(vp, foo, bar) vrecycle(vp, bar)
   #define nnpfs_vput(vp) vput(vp)
   #define nnpfs_vref(vp) VREF(vp)
   #define nnpfs_vletgo(vn) nnpfs_vrele(vn)
diff -cr arla-0.90/nnpfs/bsd/nnpfs_dev-openbsd.c arla-0.90-new/nnpfs/bsd/nnpfs_dev-openbsd.c
*** arla-0.90/nnpfs/bsd/nnpfs_dev-openbsd.c	2005-11-22 19:20:10.000000000 +0100
--- arla-0.90-new/nnpfs/bsd/nnpfs_dev-openbsd.c	2008-10-24 17:43:40.000000000 +0200
***************
*** 54,59 ****
--- 54,72 ----
   }

   int
+ nnpfs_dev_msleep(struct nnpfs *chan, caddr_t waitobj, int flags, const char *msg)
+ {
+     int ret;
+     NNPFSDEB(XDEBDEV, ("nnpfs_dev_msleep %p %x %s\n", waitobj, flags, msg));
+ 
+     simple_unlock(&chan->dev_lock);
+     ret = nnpfs_tsleep(waitobj, flags, msg);
+     simple_lock(&chan->dev_lock);
+ 
+     return ret;
+ }
+ 
+ int
   nnpfs_dev_initlock(struct nnpfs *chan)
   {
       simple_lock_init(&chan->dev_lock);
diff -cr arla-0.90/nnpfs/bsd/nnpfs_vnodeops-bsd.c arla-0.90-new/nnpfs/bsd/nnpfs_vnodeops-bsd.c
*** arla-0.90/nnpfs/bsd/nnpfs_vnodeops-bsd.c	2006-10-31 13:40:06.000000000 +0100
--- arla-0.90-new/nnpfs/bsd/nnpfs_vnodeops-bsd.c	2008-10-22 23:14:10.000000000 +0200
***************
*** 786,792 ****
       ret = lockmgr(l, flags, &vp->v_interlock, NNPFS_AP_PROC(ap));
   #endif
   #else
!     ret = lockmgr(l, flags, &vp->v_interlock);
   #endif
   #else
       ret = debuglockmgr(l, flags, &vp->v_interlock, NNPFS_AP_PROC(ap),
--- 786,792 ----
       ret = lockmgr(l, flags, &vp->v_interlock, NNPFS_AP_PROC(ap));
   #endif
   #else
!     ret = lockmgr(l, flags, NULL);
   #endif
   #else
       ret = debuglockmgr(l, flags, &vp->v_interlock, NNPFS_AP_PROC(ap),
***************
*** 835,841 ****
       ret = lockmgr (l, flags | LK_RELEASE, &vp->v_interlock, NNPFS_AP_PROC(ap));
   #endif
   #else
!     ret = lockmgr (l, flags | LK_RELEASE, &vp->v_interlock);
   #endif
   #else
       ret = debuglockmgr (l, flags | LK_RELEASE, &vp->v_interlock, NNPFS_AP_PROC(ap),
--- 835,841 ----
       ret = lockmgr (l, flags | LK_RELEASE, &vp->v_interlock, NNPFS_AP_PROC(ap));
   #endif
   #else
!     ret = lockmgr (l, flags | LK_RELEASE, NULL);
   #endif
   #else
       ret = debuglockmgr (l, flags | LK_RELEASE, &vp->v_interlock, NNPFS_AP_PROC(ap),