Add extra argument to VOP_BMAP.

SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.109
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.109
SCCS-vsn: sys/ufs/ffs/ffs_subr.c 7.27

diff --git a/usr/src/sys/ufs/ffs/ffs_subr.c b/usr/src/sys/ufs/ffs/ffs_subr.c
index 57c4c2d..62054a9 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_subr.c
+++ b/usr/src/sys/ufs/ffs/ffs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_subr.c  7.26 (Berkeley) %G%
+ *     @(#)ffs_subr.c  7.27 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -107,7 +107,7 @@ ffs_checkoverlap(bp, ip)
                if (ep == bp || (ep->b_flags & B_INVAL) ||
                    ep->b_vp == NULLVP)
                        continue;
                if (ep == bp || (ep->b_flags & B_INVAL) ||
                    ep->b_vp == NULLVP)
                        continue;

-               if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0))
+               if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL))

                        continue;
                if (vp != ip->i_devvp)
                        continue;
                        continue;
                if (vp != ip->i_devvp)
                        continue;

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index e0841c1..a1818b5 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.108 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.109 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1583,7 +1583,7 @@ ufs_strategy(ap)
                panic("ufs_strategy: spec");
        if (bp->b_blkno == bp->b_lblkno) {
                if (error =
                panic("ufs_strategy: spec");
        if (bp->b_blkno == bp->b_lblkno) {
                if (error =

-                   VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno)) {
+                   VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL)) {

                        bp->b_error = error;
                        bp->b_flags |= B_ERROR;
                        biodone(bp);
                        bp->b_error = error;
                        bp->b_flags |= B_ERROR;
                        biodone(bp);

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index e0841c1..a1818b5 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.108 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.109 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1583,7 +1583,7 @@ ufs_strategy(ap)
                panic("ufs_strategy: spec");
        if (bp->b_blkno == bp->b_lblkno) {
                if (error =
                panic("ufs_strategy: spec");
        if (bp->b_blkno == bp->b_lblkno) {
                if (error =

-                   VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno)) {
+                   VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL)) {

                        bp->b_error = error;
                        bp->b_flags |= B_ERROR;
                        biodone(bp);
                        bp->b_error = error;
                        bp->b_flags |= B_ERROR;
                        biodone(bp);