Module Name: src
Committed By: hannken
Date: Fri Jul 2 08:09:51 UTC 2010
Modified Files:
src/sys/miscfs/genfs: layer_extern.h layer_vnops.c
src/sys/miscfs/nullfs: null_vnops.c
src/sys/miscfs/overlay: overlay_vnops.c
src/sys/miscfs/umapfs: umap_vnops.c
Log Message:
LK_INTERLOCK is no longer a valid flag for VOP_LOCK(). This makes
layer_*lock*() obsolete. Remove them and handle lock operations
with the generic bypass function.
Ride 5.99.34.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/miscfs/genfs/layer_extern.h
cvs rdiff -u -r1.42 -r1.43 src/sys/miscfs/genfs/layer_vnops.c
cvs rdiff -u -r1.35 -r1.36 src/sys/miscfs/nullfs/null_vnops.c
cvs rdiff -u -r1.16 -r1.17 src/sys/miscfs/overlay/overlay_vnops.c
cvs rdiff -u -r1.49 -r1.50 src/sys/miscfs/umapfs/umap_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/miscfs/genfs/layer_extern.h
diff -u src/sys/miscfs/genfs/layer_extern.h:1.25 src/sys/miscfs/genfs/layer_extern.h:1.26
--- src/sys/miscfs/genfs/layer_extern.h:1.25 Fri Jul 2 03:16:00 2010
+++ src/sys/miscfs/genfs/layer_extern.h Fri Jul 2 08:09:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_extern.h,v 1.25 2010/07/02 03:16:00 rmind Exp $ */
+/* $NetBSD: layer_extern.h,v 1.26 2010/07/02 08:09:51 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -106,9 +106,6 @@
int layer_print(void *);
int layer_bwrite(void *);
int layer_bmap(void *);
-int layer_lock(void *);
-int layer_unlock(void *);
-int layer_islocked(void *);
int layer_fsync(void *);
int layer_lookup(void *);
int layer_setattr(void *);
Index: src/sys/miscfs/genfs/layer_vnops.c
diff -u src/sys/miscfs/genfs/layer_vnops.c:1.42 src/sys/miscfs/genfs/layer_vnops.c:1.43
--- src/sys/miscfs/genfs/layer_vnops.c:1.42 Fri Jul 2 03:16:01 2010
+++ src/sys/miscfs/genfs/layer_vnops.c Fri Jul 2 08:09:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vnops.c,v 1.42 2010/07/02 03:16:01 rmind Exp $ */
+/* $NetBSD: layer_vnops.c,v 1.43 2010/07/02 08:09:51 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.42 2010/07/02 03:16:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.43 2010/07/02 08:09:51 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -523,51 +523,6 @@
}
/*
- * We need to clear the interlock flag as it applies only to our vnode,
- * not the vnodes below us on the stack.
- */
-int
-layer_lock(void *v)
-{
- struct vop_lock_args /* {
- struct vnode *a_vp;
- int a_flags;
- struct proc *a_p;
- } */ *ap = v;
- struct vnode *vp = ap->a_vp;
-
- if (ap->a_flags & LK_INTERLOCK) {
- mutex_exit(&vp->v_interlock);
- ap->a_flags &= ~LK_INTERLOCK;
- }
- return LAYERFS_DO_BYPASS(vp, ap);
-}
-
-int
-layer_unlock(void *v)
-{
- struct vop_unlock_args /* {
- struct vnode *a_vp;
- int a_flags;
- struct proc *a_p;
- } */ *ap = v;
- struct vnode *vp = ap->a_vp;
-
- return LAYERFS_DO_BYPASS(vp, ap);
-}
-
-int
-layer_islocked(void *v)
-{
- struct vop_islocked_args /* {
- struct vnode *a_vp;
- } */ *ap = v;
- struct vnode *vp = ap->a_vp;
-
- return LAYERFS_DO_BYPASS(vp, ap);
-}
-
-/*
* If vinvalbuf is calling us, it's a "shallow fsync" -- don't bother
* syncing the underlying vnodes, since they'll be fsync'ed when
* reclaimed; otherwise, pass it through to the underlying layer.
Index: src/sys/miscfs/nullfs/null_vnops.c
diff -u src/sys/miscfs/nullfs/null_vnops.c:1.35 src/sys/miscfs/nullfs/null_vnops.c:1.36
--- src/sys/miscfs/nullfs/null_vnops.c:1.35 Fri Jul 2 03:16:01 2010
+++ src/sys/miscfs/nullfs/null_vnops.c Fri Jul 2 08:09:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: null_vnops.c,v 1.35 2010/07/02 03:16:01 rmind Exp $ */
+/* $NetBSD: null_vnops.c,v 1.36 2010/07/02 08:09:51 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: null_vnops.c,v 1.35 2010/07/02 03:16:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vnops.c,v 1.36 2010/07/02 08:09:51 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,9 +103,6 @@
{ &vop_setattr_desc, layer_setattr },
{ &vop_getattr_desc, layer_getattr },
{ &vop_access_desc, layer_access },
- { &vop_lock_desc, layer_lock },
- { &vop_unlock_desc, layer_unlock },
- { &vop_islocked_desc, layer_islocked },
{ &vop_fsync_desc, layer_fsync },
{ &vop_inactive_desc, layer_inactive },
{ &vop_reclaim_desc, layer_reclaim },
Index: src/sys/miscfs/overlay/overlay_vnops.c
diff -u src/sys/miscfs/overlay/overlay_vnops.c:1.16 src/sys/miscfs/overlay/overlay_vnops.c:1.17
--- src/sys/miscfs/overlay/overlay_vnops.c:1.16 Sun Dec 11 12:24:51 2005
+++ src/sys/miscfs/overlay/overlay_vnops.c Fri Jul 2 08:09:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: overlay_vnops.c,v 1.16 2005/12/11 12:24:51 christos Exp $ */
+/* $NetBSD: overlay_vnops.c,v 1.17 2010/07/02 08:09:51 hannken Exp $ */
/*
* Copyright (c) 1999, 2000 National Aeronautics & Space Administration
@@ -67,7 +67,7 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: overlay_vnops.c,v 1.16 2005/12/11 12:24:51 christos Exp $
+ * $Id: overlay_vnops.c,v 1.17 2010/07/02 08:09:51 hannken Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*/
@@ -126,7 +126,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.16 2005/12/11 12:24:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.17 2010/07/02 08:09:51 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,9 +152,6 @@
{ &vop_setattr_desc, layer_setattr },
{ &vop_getattr_desc, layer_getattr },
{ &vop_access_desc, layer_access },
- { &vop_lock_desc, layer_lock },
- { &vop_unlock_desc, layer_unlock },
- { &vop_islocked_desc, layer_islocked },
{ &vop_fsync_desc, layer_fsync },
{ &vop_inactive_desc, layer_inactive },
{ &vop_reclaim_desc, layer_reclaim },
Index: src/sys/miscfs/umapfs/umap_vnops.c
diff -u src/sys/miscfs/umapfs/umap_vnops.c:1.49 src/sys/miscfs/umapfs/umap_vnops.c:1.50
--- src/sys/miscfs/umapfs/umap_vnops.c:1.49 Sun Jun 6 08:01:31 2010
+++ src/sys/miscfs/umapfs/umap_vnops.c Fri Jul 2 08:09:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vnops.c,v 1.49 2010/06/06 08:01:31 hannken Exp $ */
+/* $NetBSD: umap_vnops.c,v 1.50 2010/07/02 08:09:51 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.49 2010/06/06 08:01:31 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.50 2010/07/02 08:09:51 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,9 +86,6 @@
{ &vop_print_desc, umap_print },
{ &vop_rename_desc, umap_rename },
- { &vop_lock_desc, layer_lock },
- { &vop_unlock_desc, layer_unlock },
- { &vop_islocked_desc, layer_islocked },
{ &vop_fsync_desc, layer_fsync },
{ &vop_inactive_desc, layer_inactive },
{ &vop_reclaim_desc, layer_reclaim },
