Module Name: src
Committed By: bouyer
Date: Sat Jun 18 16:17:39 UTC 2011
Modified Files:
src/lib/libpuffs [netbsd-5]: puffs.c
src/sys/fs/puffs [netbsd-5]: puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1623):
lib/libpuffs/puffs.c: revision 1.116 via patch
sys/fs/puffs/puffs_vnops.c: revision 1.151 via patch
Call advlock method if supplied
To generate a diff of this commit:
cvs rdiff -u -r1.92.4.4 -r1.92.4.5 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.129.4.7 -r1.129.4.8 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.92.4.4 src/lib/libpuffs/puffs.c:1.92.4.5
--- src/lib/libpuffs/puffs.c:1.92.4.4 Tue Oct 27 20:37:38 2009
+++ src/lib/libpuffs/puffs.c Sat Jun 18 16:17:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $ */
+/* $NetBSD: puffs.c,v 1.92.4.5 2011/06/18 16:17:38 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.92.4.5 2011/06/18 16:17:38 bouyer Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -99,6 +99,7 @@
FILLOP(print, PRINT);
FILLOP(read, READ);
FILLOP(write, WRITE);
+ FILLOP(advlock, ADVLOCK);
FILLOP(abortop, ABORTOP);
}
#undef FILLOP
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.129.4.7 src/sys/fs/puffs/puffs_vnops.c:1.129.4.8
--- src/sys/fs/puffs/puffs_vnops.c:1.129.4.7 Sat Jan 16 17:52:13 2010
+++ src/sys/fs/puffs/puffs_vnops.c Sat Jun 18 16:17:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.129.4.7 2010/01/16 17:52:13 bouyer Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.129.4.8 2011/06/18 16:17:38 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.129.4.7 2010/01/16 17:52:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.129.4.8 2011/06/18 16:17:38 bouyer Exp $");
#include <sys/param.h>
#include <sys/fstrans.h>
@@ -39,6 +39,7 @@
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/proc.h>
+#include <sys/lockf.h>
#include <uvm/uvm.h>
@@ -2124,24 +2125,25 @@
} */ *ap = v;
PUFFS_MSG_VARS(vn, advlock);
struct vnode *vp = ap->a_vp;
+ struct puffs_node *pn = VPTOPP(vp);
struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
int error;
+ if (!EXISTSOP(pmp, ADVLOCK))
+ return lf_advlock(ap, &pn->pn_lockf, vp->v_size);
+
PUFFS_MSG_ALLOC(vn, advlock);
- error = copyin(ap->a_fl, &advlock_msg->pvnr_fl, sizeof(struct flock));
- if (error)
- goto out;
+ (void)memcpy(&advlock_msg->pvnr_fl, ap->a_fl,
+ sizeof(advlock_msg->pvnr_fl));
advlock_msg->pvnr_id = ap->a_id;
advlock_msg->pvnr_op = ap->a_op;
advlock_msg->pvnr_flags = ap->a_flags;
puffs_msg_setinfo(park_advlock, PUFFSOP_VN,
PUFFS_VN_ADVLOCK, VPTOPNC(vp));
-
PUFFS_MSG_ENQUEUEWAIT2(pmp, park_advlock, vp->v_data, NULL, error);
error = checkerr(pmp, error, __func__);
-
- out:
PUFFS_MSG_RELEASE(advlock);
+
return error;
}
