Added VOP_GETPAGES/VOP_PUTPAGES and also the "backwards" block count

for VOP_BMAP.  Updated affected filesystems...

7 files changed, 29 insertions, 10 deletions

diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index 32439ce..df18299 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_bmap.c,v 1.2 1994/08/02 07:41:15 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -62,6 +62,7 @@ cd9660_bmap(ap)
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
 		int *a_runp;
+		int *a_runb;
 	} */ *ap;
 {
 	struct iso_node *ip = VTOI(ap->a_vp);
@@ -99,5 +100,9 @@ cd9660_bmap(ap)
 			*ap->a_runp = nblk;
 	}
 
+	if (ap->a_runb) {
+		*ap->a_runb = 0;
+	}
+
 	return 0;
 }
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index f738565..a187a66 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.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.14 1995/05/30 08:05:05 rgrimes Exp $
+ * $Id: cd9660_vnops.c,v 1.15 1995/08/02 13:00:40 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -830,7 +830,7 @@ cd9660_strategy(ap)
 		panic("cd9660_strategy: spec");
 	if (bp->b_blkno == bp->b_lblkno) {
 		if ((error =
-		    VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL))) {
+		    VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL, NULL))) {
 			bp->b_error = error;
 			bp->b_flags |= B_ERROR;
 			biodone(bp);
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index d701c33..56a33bc 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.5 1994/10/06 21:06:40 davidg Exp $
+ * $Id: dead_vnops.c,v 1.6 1994/10/08 22:37:00 phk Exp $
  */
 
 #include <sys/param.h>
@@ -301,12 +301,13 @@ dead_bmap(ap)
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
 		int *a_runp;
+		int *a_runb;
 	} */ *ap;
 {
 
 	if (!chkvnlock(ap->a_vp))
 		return (EIO);
-	return (VOP_BMAP(ap->a_vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp));
+	return (VOP_BMAP(ap->a_vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp, ap->a_runb));
 }
 
 /*
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 0f4f34b..8291ebb 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.8 1995/03/16 18:13:13 bde Exp $
+ * $Id: fifo_vnops.c,v 1.10 1995/08/06 16:14:21 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -362,6 +362,8 @@ fifo_bmap(ap)
 		daddr_t  a_bn;
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
+		int *a_runp;
+		int *a_runb;
 	} */ *ap;
 {
 
@@ -371,6 +373,8 @@ fifo_bmap(ap)
 		*ap->a_bnp = ap->a_bn;
 	if (ap->a_runp != NULL)
 		*ap->a_runp = 0;
+	if (ap->a_runb != NULL)
+		*ap->a_runb = 0;
 	return (0);
 }
 
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 5e8ca1d..6689d1d 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.21 1995/08/03 12:17:35 dfr Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.22 1995/08/25 20:12:23 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -1816,6 +1816,7 @@ msdosfs_bmap(ap)
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
 		int *a_runp;
+		int *a_runb;
 	} */ *ap;
 {
 	struct denode *dep = VTODE(ap->a_vp);
@@ -1830,6 +1831,9 @@ msdosfs_bmap(ap)
 		 */
 		*ap->a_runp = 0;
 	}
+	if (ap->a_runb) {
+		*ap->a_runb = 0;
+	}
 	return pcbmap(dep, ap->a_bn, ap->a_bnp, 0);
 }
 
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 8e17858..1b27852 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.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.12 1995/07/08 04:03:12 davidg Exp $
+ * $Id: spec_vnops.c,v 1.13 1995/07/29 11:40:31 bde Exp $
  */
 
 #include <sys/param.h>
@@ -498,6 +498,8 @@ spec_bmap(ap)
 		daddr_t  a_bn;
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
+		int *a_runp;
+		int *a_runb;
 	} */ *ap;
 {
 
@@ -507,6 +509,8 @@ spec_bmap(ap)
 		*ap->a_bnp = ap->a_bn;
 	if (ap->a_runp != NULL)
 		*ap->a_runp = 0;
+	if (ap->a_runb != NULL)
+		*ap->a_runb = 0;
 	return (0);
 }
 
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 855620c..04db44f 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.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.10 1995/08/01 18:50:53 davidg Exp $
+ * $Id: union_vnops.c,v 1.11 1995/08/17 11:53:51 bde Exp $
  */
 
 #include <sys/param.h>
@@ -1337,6 +1337,7 @@ union_bmap(ap)
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
 		int *a_runp;
+		int *a_runb;
 	} */ *ap;
 {
 	int error;
@@ -1347,7 +1348,7 @@ union_bmap(ap)
 		VOP_LOCK(vp);
 	else
 		FIXUP(VTOUNION(ap->a_vp));
-	error = VOP_BMAP(vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp);
+	error = VOP_BMAP(vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp, ap->a_runb);
 	if (dolock)
 		VOP_UNLOCK(vp);