Module Name: src
Committed By: kefren
Date: Tue Jan 11 14:04:54 UTC 2011
Modified Files:
src/sys/fs/puffs: puffs_sys.h puffs_vnops.c
Log Message:
add advlock to puffs. ok pooka@
should fix kern/43321
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/fs/puffs/puffs_sys.h
cvs rdiff -u -r1.149 -r1.150 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/sys/fs/puffs/puffs_sys.h
diff -u src/sys/fs/puffs/puffs_sys.h:1.76 src/sys/fs/puffs/puffs_sys.h:1.77
--- src/sys/fs/puffs/puffs_sys.h:1.76 Tue Jul 6 13:47:47 2010
+++ src/sys/fs/puffs/puffs_sys.h Tue Jan 11 14:04:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_sys.h,v 1.76 2010/07/06 13:47:47 pooka Exp $ */
+/* $NetBSD: puffs_sys.h,v 1.77 2011/01/11 14:04:54 kefren Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -207,6 +207,8 @@
voff_t pn_serversize;
+ struct lockf * pn_lockf;
+
LIST_ENTRY(puffs_node) pn_hashent;
};
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.149 src/sys/fs/puffs/puffs_vnops.c:1.150
--- src/sys/fs/puffs/puffs_vnops.c:1.149 Tue Nov 30 10:43:03 2010
+++ src/sys/fs/puffs/puffs_vnops.c Tue Jan 11 14:04:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.149 2010/11/30 10:43:03 dholland Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.150 2011/01/11 14:04:54 kefren Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,10 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.149 2010/11/30 10:43:03 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.150 2011/01/11 14:04:54 kefren Exp $");
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/lockf.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/namei.h>
@@ -124,7 +125,7 @@
{ &vop_getpages_desc, puffs_vnop_checkop }, /* getpages */
{ &vop_putpages_desc, genfs_putpages }, /* REAL putpages */
{ &vop_pathconf_desc, puffs_vnop_checkop }, /* pathconf */
- { &vop_advlock_desc, puffs_vnop_checkop }, /* advlock */
+ { &vop_advlock_desc, puffs_vnop_advlock }, /* REAL advlock */
{ &vop_strategy_desc, puffs_vnop_strategy }, /* REAL strategy */
{ &vop_revoke_desc, genfs_revoke }, /* REAL revoke */
{ &vop_abortop_desc, puffs_vnop_abortop }, /* REAL abortop */
@@ -291,7 +292,6 @@
{ &vop_print_desc, puffs_vnop_print }, /* print */
{ &vop_islocked_desc, puffs_vnop_islocked }, /* islocked */
{ &vop_pathconf_desc, puffs_vnop_pathconf }, /* pathconf */
- { &vop_advlock_desc, puffs_vnop_advlock }, /* advlock */
{ &vop_getpages_desc, puffs_vnop_getpages }, /* getpages */
{ NULL, NULL }
};
@@ -375,7 +375,6 @@
CHECKOP_NOTSUPP(READLINK);
CHECKOP_NOTSUPP(PRINT);
CHECKOP_NOTSUPP(PATHCONF);
- CHECKOP_NOTSUPP(ADVLOCK);
CHECKOP_NOTSUPP(GETEXTATTR);
CHECKOP_NOTSUPP(SETEXTATTR);
CHECKOP_NOTSUPP(LISTEXTATTR);
@@ -2109,27 +2108,10 @@
struct flock *a_fl;
int a_flags;
} */ *ap = v;
- PUFFS_MSG_VARS(vn, advlock);
struct vnode *vp = ap->a_vp;
- struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
- int error;
-
- PUFFS_MSG_ALLOC(vn, advlock);
- error = copyin(ap->a_fl, &advlock_msg->pvnr_fl, sizeof(struct flock));
- if (error)
- goto out;
- 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__);
+ struct puffs_node *pn = VPTOPP(vp);
- out:
- PUFFS_MSG_RELEASE(advlock);
- return error;
+ return lf_advlock(ap, &pn->pn_lockf, vp->v_size);
}
int
