[4470] in arla-drinkers
Re: PATCH: Arla 0.90 on OpenBSD 4.3
daemon@ATHENA.MIT.EDU (=?ISO-8859-1?Q?Bo_Brant=E9n?=)
Fri Oct 24 10:05:20 2008
From arla-drinkers-bounces@stacken.kth.se Fri Oct 24 14:05:20 2008
Return-Path: <arla-drinkers-bounces@stacken.kth.se>
Delivered-To: arla-drinkers-mtg@bloom-picayune.mit.edu
Received: (qmail 26674 invoked from network); 24 Oct 2008 14:05:19 -0000
Received: from mx3.kth.se (130.237.48.97)
by charon.mit.edu with SMTP; 24 Oct 2008 14:05:19 -0000
Received: from localhost (localhost [127.0.0.1])
by mx3.kth.se (Postfix) with ESMTP id 375A36A745;
Fri, 24 Oct 2008 16:05:17 +0200 (CEST)
X-Virus-Scanned: by amavisd-new at kth.se
Received: from mx3.kth.se ([127.0.0.1])
by localhost (mx3.kth.se [127.0.0.1]) (amavisd-new, port 10024)
with LMTP id djYYp+on4b5P; Fri, 24 Oct 2008 16:05:15 +0200 (CEST)
Received: from tapas.stacken.kth.se (tapas.stacken.kth.se [130.237.234.140])
by mx3.kth.se (Postfix) with ESMTP id 58E0E69728;
Fri, 24 Oct 2008 16:04:57 +0200 (CEST)
Received: from tapas.stacken.kth.se (localhost [127.0.0.1])
by tapas.stacken.kth.se (Postfix) with ESMTP id 521E851D5B;
Fri, 24 Oct 2008 16:04:57 +0200 (CEST)
X-Original-To: arla-drinkers@tapas.stacken.kth.se
Delivered-To: arla-drinkers@tapas.stacken.kth.se
Received: from brev.stacken.kth.se (brev.stacken.kth.se [130.237.234.84])
by tapas.stacken.kth.se (Postfix) with ESMTP id A0DF551D5B
for <arla-drinkers@tapas.stacken.kth.se>;
Fri, 24 Oct 2008 16:04:55 +0200 (CEST)
Received: from mx3.kth.se (mx3.kth.se [130.237.48.97])
by brev.stacken.kth.se (8.12.10/8.12.10) with ESMTP id m9OE4svG026355
for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:54 +0200 (MET DST)
Received: from localhost (localhost [127.0.0.1])
by mx3.kth.se (Postfix) with ESMTP id 61C8A6A610
for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:49 +0200 (CEST)
X-Virus-Scanned: by amavisd-new at kth.se
Received: from mx3.kth.se ([127.0.0.1])
by localhost (mx3.kth.se [127.0.0.1]) (amavisd-new, port 10024)
with LMTP id 76ZWOd05C+8U for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:47 +0200 (CEST)
Received: from mail.acc.umu.se (mail.acc.umu.se [IPv6:2001:6b0:e:2018::156])
by mx3.kth.se (Postfix) with ESMTP id 084A369728
for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:46 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by amavisd-new (Postfix) with ESMTP id B8306AC3
for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:46 +0200 (MEST)
X-Virus-Scanned: amavisd-new at acc.umu.se
Received: from stalin.acc.umu.se (stalin.acc.umu.se [130.239.18.135])
by mail.acc.umu.se (Postfix) with ESMTP id 08DDEAC2
for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:42 +0200 (MEST)
Received: by stalin.acc.umu.se (Postfix, from userid 10005)
id D918F2C; Fri, 24 Oct 2008 16:04:41 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by stalin.acc.umu.se (Postfix) with ESMTP id CA4AC2B
for <arla-drinkers@stacken.kth.se>;
Fri, 24 Oct 2008 16:04:41 +0200 (CEST)
Date: Fri, 24 Oct 2008 16:04:41 +0200 (CEST)
From: =?ISO-8859-1?Q?Bo_Brant=E9n?= <bosse@acc.umu.se>
To: arla-drinkers@stacken.kth.se
Subject: Re: PATCH: Arla 0.90 on OpenBSD 4.3
In-Reply-To: <Pine.A41.4.64.0810231811480.839732@stalin.acc.umu.se>
Message-ID: <Pine.A41.4.64.0810241559370.659514@stalin.acc.umu.se>
References: <Pine.A41.4.64.0810231811480.839732@stalin.acc.umu.se>
MIME-Version: 1.0
X-BeenThere: arla-drinkers@stacken.kth.se
X-Mailman-Version: 2.1.6
Precedence: list
List-Id: Arla discussions <arla-drinkers.stacken.kth.se>
List-Unsubscribe: <https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers>,
<mailto:arla-drinkers-request@stacken.kth.se?subject=unsubscribe>
List-Archive: <http://lists.stacken.kth.se/pipermail/arla-drinkers>
List-Post: <mailto:arla-drinkers@stacken.kth.se>
List-Help: <mailto:arla-drinkers-request@stacken.kth.se?subject=help>
List-Subscribe: <https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers>,
<mailto:arla-drinkers-request@stacken.kth.se?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: arla-drinkers-bounces@stacken.kth.se
Errors-To: arla-drinkers-bounces@stacken.kth.se
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),
_______________________________________________
Arla-drinkers mailing list
Arla-drinkers@stacken.kth.se
https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers
