From 41db6f5f9906e8f4e88d62cdd7eb7baaa4ddaf9e Mon Sep 17 00:00:00 2001 From: John Dyson Date: Sun, 3 Sep 1995 20:32:52 +0000 Subject: [PATCH] VOP_BMAP will eventually need an additional argument, but not yet. This backs out that modification to minimize the window during which this is not yet correct. --- sys/kern/vfs_cluster.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 3f55ff99f626..b4d9a42e5969 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.17 1995/06/28 12:31:47 davidg Exp $ + * $Id: vfs_cluster.c,v 1.18 1995/09/03 19:56:15 dyson Exp $ */ #include @@ -214,7 +214,7 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp) rbp = NULL; if (!alreadyincore && (rablkno + 1) * size <= filesize && - !(error = VOP_BMAP(vp, rablkno, NULL, &blkno, &num_ra, NULL)) && + !(error = VOP_BMAP(vp, rablkno, NULL, &blkno, &num_ra)) && blkno != -1) { if (num_ra > vp->v_ralen) num_ra = vp->v_ralen; @@ -505,7 +505,7 @@ cluster_write(bp, filesize) */ if ((lbn + 1) * lblocksize != filesize && (bp->b_blkno == bp->b_lblkno) && - (VOP_BMAP(vp, lbn, NULL, &bp->b_blkno, &maxclen, NULL) || + (VOP_BMAP(vp, lbn, NULL, &bp->b_blkno, &maxclen) || bp->b_blkno == -1)) { bawrite(bp); vp->v_clen = 0;