[4467] in arla-drinkers
PATCH: Arla CVS Current on OpenBSD 4.3
daemon@ATHENA.MIT.EDU (=?ISO-8859-1?Q?Bo_Brant=E9n?=)
Thu Oct 23 12:17:16 2008
From arla-drinkers-bounces@stacken.kth.se Thu Oct 23 16:17:16 2008
Return-Path: <arla-drinkers-bounces@stacken.kth.se>
Delivered-To: arla-drinkers-mtg@bloom-picayune.mit.edu
Received: (qmail 6653 invoked from network); 23 Oct 2008 16:17:15 -0000
Received: from mx3.kth.se (130.237.48.97)
by charon.mit.edu with SMTP; 23 Oct 2008 16:17:15 -0000
Received: from localhost (localhost [127.0.0.1])
by mx3.kth.se (Postfix) with ESMTP id 3DFC06A62E;
Thu, 23 Oct 2008 18:17:14 +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 tf9uearpOsVM; Thu, 23 Oct 2008 18:17:12 +0200 (CEST)
Received: from tapas.stacken.kth.se (tapas.stacken.kth.se [130.237.234.140])
by mx3.kth.se (Postfix) with ESMTP id DDD316A6E9;
Thu, 23 Oct 2008 18:17:03 +0200 (CEST)
Received: from tapas.stacken.kth.se (localhost [127.0.0.1])
by tapas.stacken.kth.se (Postfix) with ESMTP id 605DD51D5B;
Thu, 23 Oct 2008 18:17:03 +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 351FD51D5B
for <arla-drinkers@tapas.stacken.kth.se>;
Thu, 23 Oct 2008 18:17:01 +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 m9NGH0vG019833
for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:17:00 +0200 (MET DST)
Received: from localhost (localhost [127.0.0.1])
by mx3.kth.se (Postfix) with ESMTP id B776C6A62E
for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:16:55 +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 dJo+zMOtpfKY for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:16:49 +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 CFEDC6A61E
for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:16:49 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by amavisd-new (Postfix) with ESMTP id A07A8360
for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:16:49 +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 325A335F
for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:16:48 +0200 (MEST)
Received: by stalin.acc.umu.se (Postfix, from userid 10005)
id 096A92C; Thu, 23 Oct 2008 18:16:47 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by stalin.acc.umu.se (Postfix) with ESMTP id ED79B2B
for <arla-drinkers@stacken.kth.se>;
Thu, 23 Oct 2008 18:16:47 +0200 (CEST)
Date: Thu, 23 Oct 2008 18:16:47 +0200 (CEST)
From: =?ISO-8859-1?Q?Bo_Brant=E9n?= <bosse@acc.umu.se>
To: arla-drinkers@stacken.kth.se
Subject: PATCH: Arla CVS Current on OpenBSD 4.3
Message-ID: <Pine.A41.4.64.0810231814050.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
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 ----
_______________________________________________
Arla-drinkers mailing list
Arla-drinkers@stacken.kth.se
https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers
