d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the same KASSERT to all VOP_STRATEGY and VOP_SPECSTRATEGY implementations

Browse Source 
to check that the buffer points to the correct vnode.
This commit is contained in:
Poul-Henning Kamp 2003-06-15 18:53:00 +00:00
parent 76dbe2e720
commit cefb5754dd
16 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/cd9660/cd9660_vnops.c
View File

@ -718,6 +718,8 @@ cd9660_strategy(ap)
struct vnode *vp = bp->b_vp;
struct iso_node *ip;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
ip = VTOI(vp);
if (vp->v_type == VBLK || vp->v_type == VCHR)
panic("cd9660_strategy: spec");

2
sys/fs/hpfs/hpfs_vnops.c
View File

@ -651,6 +651,8 @@ hpfs_strategy(ap)
daddr_t blkno;
int error;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
dprintf(("hpfs_strategy(): \n"));
if (vp->v_type == VBLK || vp->v_type == VCHR)

2
sys/fs/msdosfs/msdosfs_vnops.c
View File

@ -1749,6 +1749,8 @@ msdosfs_strategy(ap)
int error = 0;
daddr_t blkno;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
if (bp->b_vp->v_type == VBLK || bp->b_vp->v_type == VCHR)
panic("msdosfs_strategy: spec");
/*

2
sys/fs/ntfs/ntfs_vnops.c
View File

@ -282,6 +282,8 @@ ntfs_strategy(ap)
struct ntfsmount *ntmp = ip->i_mp;
int error;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
dprintf(("ntfs_strategy: offset: %d, blkno: %d, lblkno: %d\n",
(u_int32_t)bp->b_offset,(u_int32_t)bp->b_blkno,
(u_int32_t)bp->b_lblkno));

2
sys/fs/nwfs/nwfs_vnops.c
View File

@ -796,6 +796,8 @@ static int nwfs_strategy (ap)
struct thread *td;
int error = 0;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
NCPVNDEBUG("\n");
if (bp->b_flags & B_PHYS)
panic("nwfs physio");

2
sys/fs/smbfs/smbfs_vnops.c
View File

@ -886,6 +886,8 @@ smbfs_strategy (ap)
struct thread *td;
int error = 0;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
SMBVDEBUG("\n");
if (bp->b_flags & B_PHYS)
panic("smbfs physio");

4
sys/fs/specfs/spec_vnops.c
View File

@ -531,6 +531,8 @@ spec_strategy(ap)
{
static int once;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
if (!once) {
vprint("VOP_STRATEGY on VCHR", ap->a_vp);
backtrace();
@ -547,6 +549,8 @@ spec_specstrategy(ap)
} */ *ap;
{
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
return spec_xstrategy(ap->a_vp, ap->a_bp);
}

2
sys/fs/udf/udf_vnops.c
View File

@ -819,6 +819,8 @@ udf_strategy(struct vop_strategy_args *a)
vp = bp->b_vp;
node = VTON(vp);
KASSERT(a->a_vp == a->a_bp->b_vp, ("%s(%p != %p)",
__func__, a->a_vp, a->a_bp->b_vp));
/* cd9660 has this test reversed, but it seems more logical this way */
if (bp->b_blkno != bp->b_lblkno) {
/*

2
sys/fs/unionfs/union_vnops.c
View File

@ -1830,6 +1830,8 @@ union_strategy(ap)
struct buf *bp = ap->a_bp;
struct vnode *othervp = OTHERVP(bp->b_vp);
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
#ifdef DIAGNOSTIC
if (othervp == NULLVP)
panic("union_strategy: nil vp");

2
sys/gnu/ext2fs/ext2_vnops.c
View File

@ -1461,6 +1461,8 @@ ext2_strategy(ap)
int32_t blkno;
int error;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
ip = VTOI(vp);
if (vp->v_type == VBLK || vp->v_type == VCHR)
panic("ext2_strategy: spec");

2
sys/gnu/fs/ext2fs/ext2_vnops.c
View File

@ -1461,6 +1461,8 @@ ext2_strategy(ap)
int32_t blkno;
int error;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
ip = VTOI(vp);
if (vp->v_type == VBLK || vp->v_type == VCHR)
panic("ext2_strategy: spec");

2
sys/isofs/cd9660/cd9660_vnops.c
View File

@ -718,6 +718,8 @@ cd9660_strategy(ap)
struct vnode *vp = bp->b_vp;
struct iso_node *ip;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
ip = VTOI(vp);
if (vp->v_type == VBLK || vp->v_type == VCHR)
panic("cd9660_strategy: spec");

2
sys/nfsclient/nfs_vnops.c
View File

@ -2552,6 +2552,8 @@ nfs_strategy(struct vop_strategy_args *ap)
struct thread *td;
int error = 0;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
KASSERT(!(bp->b_flags & B_DONE), ("nfs_strategy: buffer %p unexpectedly marked B_DONE", bp));
KASSERT(BUF_REFCNT(bp) > 0, ("nfs_strategy: buffer %p not locked", bp));

2
sys/ufs/ffs/ffs_vnops.c
View File

@ -1384,6 +1384,8 @@ struct vop_strategy_args {
struct vnode *vp;
daddr_t lbn;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
vp = ap->a_vp;
lbn = ap->a_bp->b_lblkno;
if (VTOI(vp)->i_fs->fs_magic == FS_UFS2_MAGIC &&

2
sys/ufs/ufs/ufs_vnops.c
View File

@ -1949,6 +1949,8 @@ ufs_strategy(ap)
ufs2_daddr_t blkno;
int error;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
ip = VTOI(vp);
if (bp->b_blkno == bp->b_lblkno) {
error = ufs_bmaparray(vp, bp->b_lblkno, &blkno, bp, NULL, NULL);

2
sys/vm/vm_swap.c
View File

@ -105,6 +105,8 @@ swapdev_strategy(ap)
struct vnode *vp;
struct buf *bp;
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
bp = ap->a_bp;
sz = howmany(bp->b_bcount, PAGE_SIZE);