VOP_STRATEGY grows an (struct vnode *) argument

as the value in b_vp is often not really what you want.
(and needs to be frobbed). more cleanups will follow this.
Reviewed by: Bruce Evans <bde@freebsd.org>

6 files changed, 17 insertions, 13 deletions

diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 8bdcaea..c016056 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.51 1997/12/27 02:56:20 bde Exp $
+ * $Id: cd9660_vnops.c,v 1.52 1998/03/06 09:46:14 msmith Exp $
  */
 
 #include <sys/param.h>
@@ -727,6 +727,7 @@ cd9660_abortop(ap)
 static int
 cd9660_strategy(ap)
 	struct vop_strategy_args /* {
+		struct buf *a_vp;
 		struct buf *a_bp;
 	} */ *ap;
 {
@@ -755,7 +756,7 @@ cd9660_strategy(ap)
 	}
 	vp = ip->i_devvp;
 	bp->b_dev = vp->v_rdev;
-	VOCALL (vp->v_op, VOFFSET(vop_strategy), ap);
+	VOP_STRATEGY(vp, bp);
 	return (0);
 }
 
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 59dda79..722938b 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.71 1998/06/10 06:30:31 peter Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.73 1998/06/10 13:46:46 dt Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
@@ -1813,6 +1813,7 @@ msdosfs_bmap(ap)
 static int
 msdosfs_strategy(ap)
 	struct vop_strategy_args /* {
+		struct vnode *a_vp;
 		struct buf *a_bp;
 	} */ *ap;
 {
@@ -1850,7 +1851,7 @@ msdosfs_strategy(ap)
 	 */
 	vp = dep->de_devvp;
 	bp->b_dev = vp->v_rdev;
-	VOCALL(vp->v_op, VOFFSET(vop_strategy), ap);
+	VOP_STRATEGY(vp, bp);
 	return (0);
 }
 
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index a299e27..1398e34 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.27 1998/04/17 22:36:54 des Exp $
+ *	$Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.27 1998/04/17 22:36:54 des Exp $
+ * $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
  */
 
 /*
@@ -612,7 +612,7 @@ null_strategy(ap)
 	savedvp = bp->b_vp;
 	bp->b_vp = NULLVPTOLOWERVP(bp->b_vp);
 
-	error = VOP_STRATEGY(bp);
+	error = VOP_STRATEGY(bp->b_vp, bp);
 
 	bp->b_vp = savedvp;
 
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index ef39ab5..a49a106 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.62 1998/05/21 07:47:49 dyson Exp $
+ * $Id: spec_vnops.c,v 1.63 1998/06/07 17:11:59 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -805,7 +805,7 @@ spec_getpages(ap)
 	cnt.v_vnodepgsin += pcount;
 
 	/* Do the input. */
-	VOP_STRATEGY(bp);
+	VOP_STRATEGY(bp->b_vp, bp);
 
 	s = splbio();
 
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index f37e4c7..b90b351 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.22 1997/10/21 21:08:17 roberto Exp $
+ * $Id: umap_vnops.c,v 1.23 1998/02/07 01:36:24 kato Exp $
  */
 
 /*
@@ -430,6 +430,7 @@ umap_reclaim(ap)
 static int
 umap_strategy(ap)
 	struct vop_strategy_args /* {
+		struct vnode *a_vp;
 		struct buf *a_bp;
 	} */ *ap;
 {
@@ -440,7 +441,7 @@ umap_strategy(ap)
 	savedvp = bp->b_vp;
 	bp->b_vp = UMAPVPTOLOWERVP(bp->b_vp);
 
-	error = VOP_STRATEGY(ap->a_bp);
+	error = VOP_STRATEGY(bp->b_vp, ap->a_bp);
 
 	bp->b_vp = savedvp;
 
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index f1c6d78..2bcd1ee 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.56 1998/03/17 08:47:50 kato Exp $
+ * $Id: union_vnops.c,v 1.57 1998/05/07 04:58:38 msmith Exp $
  */
 
 #include <sys/param.h>
@@ -1725,6 +1725,7 @@ union_advlock(ap)
 static int
 union_strategy(ap)
 	struct vop_strategy_args /* {
+		struct vnode *a_vp;
 		struct buf *a_bp;
 	} */ *ap;
 {
@@ -1743,7 +1744,7 @@ union_strategy(ap)
 		panic("union_strategy: writing to lowervp");
 #endif
 
-	error = VOP_STRATEGY(bp);
+	error = VOP_STRATEGY(bp->b_vp, bp);
 	bp->b_vp = savedvp;
 
 	return (error);