[src/trunk]: src/sys/miscfs LK_INTERLOCK is no longer a valid flag for VOP_LO...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/44da6b933bf2
branches:  trunk
changeset: 755999:44da6b933bf2
user:      hannken <hannken%NetBSD.org@localhost>
date:      Fri Jul 02 08:09:51 2010 +0000

description:
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.

diffstat:

 sys/miscfs/genfs/layer_extern.h    |   5 +---
 sys/miscfs/genfs/layer_vnops.c     |  49 +------------------------------------
 sys/miscfs/nullfs/null_vnops.c     |   7 +---
 sys/miscfs/overlay/overlay_vnops.c |   9 ++----
 sys/miscfs/umapfs/umap_vnops.c     |   7 +---
 5 files changed, 10 insertions(+), 67 deletions(-)

diffs (182 lines):

diff -r cbd0e48c561a -r 44da6b933bf2 sys/miscfs/genfs/layer_extern.h
--- a/sys/miscfs/genfs/layer_extern.h   Fri Jul 02 07:56:46 2010 +0000
+++ b/sys/miscfs/genfs/layer_extern.h   Fri Jul 02 08:09:51 2010 +0000
@@ -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 *);
diff -r cbd0e48c561a -r 44da6b933bf2 sys/miscfs/genfs/layer_vnops.c
--- a/sys/miscfs/genfs/layer_vnops.c    Fri Jul 02 07:56:46 2010 +0000
+++ b/sys/miscfs/genfs/layer_vnops.c    Fri Jul 02 08:09:51 2010 +0000
@@ -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.
diff -r cbd0e48c561a -r 44da6b933bf2 sys/miscfs/nullfs/null_vnops.c
--- a/sys/miscfs/nullfs/null_vnops.c    Fri Jul 02 07:56:46 2010 +0000
+++ b/sys/miscfs/nullfs/null_vnops.c    Fri Jul 02 08:09:51 2010 +0000
@@ -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 },
diff -r cbd0e48c561a -r 44da6b933bf2 sys/miscfs/overlay/overlay_vnops.c
--- a/sys/miscfs/overlay/overlay_vnops.c        Fri Jul 02 07:56:46 2010 +0000
+++ b/sys/miscfs/overlay/overlay_vnops.c        Fri Jul 02 08:09:51 2010 +0000
@@ -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 },
diff -r cbd0e48c561a -r 44da6b933bf2 sys/miscfs/umapfs/umap_vnops.c
--- a/sys/miscfs/umapfs/umap_vnops.c    Fri Jul 02 07:56:46 2010 +0000
+++ b/sys/miscfs/umapfs/umap_vnops.c    Fri Jul 02 08:09:51 2010 +0000
@@ -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 },