summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/fs/hpfs/hpfs_vnops.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c2
-rw-r--r--sys/fs/udf/udf_vnops.c2
-rw-r--r--sys/gnu/ext2fs/ext2_vnops.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vnops.c2
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/sys/buf.h4
-rw-r--r--sys/sys/bufobj.h3
-rw-r--r--sys/ufs/ffs/ffs_rawread.c2
-rw-r--r--sys/ufs/ufs/ufs_vnops.c2
11 files changed, 14 insertions, 11 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 4a9e473..bc45abe 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -733,7 +733,7 @@ cd9660_strategy(ap)
}
bp->b_iooffset = dbtob(bp->b_blkno);
bo = ip->i_mnt->im_bo;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 0381bef..c98a3ca 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -674,7 +674,7 @@ hpfs_strategy(ap)
}
bp->b_iooffset = dbtob(bp->b_blkno);
bo = hp->h_hpmp->hpm_bo;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 1516922..edb06ed 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1803,7 +1803,7 @@ msdosfs_strategy(ap)
*/
bp->b_iooffset = dbtob(bp->b_blkno);
bo = dep->de_pmp->pm_bo;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 33dde60..916fd5b 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -848,7 +848,7 @@ udf_strategy(struct vop_strategy_args *a)
}
bo = node->udfmp->im_bo;
bp->b_iooffset = dbtob(bp->b_blkno);
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 7c864c6..0f267b5 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -1432,7 +1432,7 @@ ext2_strategy(ap)
}
bp->b_iooffset = dbtob(bp->b_blkno);
bo = VFSTOEXT2(vp->v_mount)->um_bo;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 7c864c6..0f267b5 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -1432,7 +1432,7 @@ ext2_strategy(ap)
}
bp->b_iooffset = dbtob(bp->b_blkno);
bo = VFSTOEXT2(vp->v_mount)->um_bo;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 4a9e473..bc45abe 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -733,7 +733,7 @@ cd9660_strategy(ap)
}
bp->b_iooffset = dbtob(bp->b_blkno);
bo = ip->i_mnt->im_bo;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index e8cc5a3..25a9133 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -399,7 +399,7 @@ bwrite(struct buf *bp)
KASSERT(bp->b_bufobj->bo_ops != NULL, ("bwrite: no bo_ops bp=%p", bp));
KASSERT(bp->b_bufobj->bo_ops->bop_write != NULL,
("bwrite: no bop_write bp=%p", bp));
- return (bp->b_bufobj->bo_ops->bop_write(bp));
+ return (BO_WRITE(bp->b_bufobj, bp));
}
static __inline void
@@ -411,7 +411,7 @@ bstrategy(struct buf *bp)
("bstrategy: no bo_ops bp=%p", bp));
KASSERT(bp->b_bufobj->bo_ops->bop_strategy != NULL,
("bstrategy: no bop_strategy bp=%p", bp));
- bp->b_bufobj->bo_ops->bop_strategy(bp->b_bufobj, bp);
+ BO_STRATEGY(bp->b_bufobj, bp);
}
static __inline void
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index b41ed0c..523ba43 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -76,6 +76,9 @@ struct buf_ops {
b_strategy_t *bop_strategy;
};
+#define BO_STRATEGY(bo, bp) ((bo)->bo_ops->bop_strategy((bo), (bp)))
+#define BO_WRITE(bo, bp) ((bo)->bo_ops->bop_write((bp)))
+
struct bufobj {
struct mtx *bo_mtx; /* Mutex which protects "i" things */
struct bufv bo_clean; /* i Clean buffers */
diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c
index e147b4a..154cc60 100644
--- a/sys/ufs/ffs/ffs_rawread.c
+++ b/sys/ufs/ffs/ffs_rawread.c
@@ -252,7 +252,7 @@ ffs_rawread_readahead(struct vnode *vp,
if (vmapbuf(bp) < 0)
return EFAULT;
- dp->v_bufobj.bo_ops->bop_strategy(&dp->v_bufobj, bp);
+ BO_STRATEGY(&dp->v_bufobj, bp);
return 0;
}
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 90771bf..f376e3f 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1949,7 +1949,7 @@ ufs_strategy(ap)
}
bp->b_iooffset = dbtob(bp->b_blkno);
bo = ip->i_umbufobj;
- bo->bo_ops->bop_strategy(bo, bp);
+ BO_STRATEGY(bo, bp);
return (0);
}
OpenPOWER on IntegriCloud