diff options
| author | phk <phk@FreeBSD.org> | 2004-10-29 10:52:31 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-10-29 10:52:31 +0000 |
| commit | 546ea57ed3b872e85b301825a19724aaa45dc9f8 (patch) | |
| tree | b7042c5cda590fc76637bb680ddad47c252e138a | |
| parent | ff969023bb03f8dcf70b4b41d7aebe61a891773e (diff) | |
| download | FreeBSD-src-546ea57ed3b872e85b301825a19724aaa45dc9f8.zip FreeBSD-src-546ea57ed3b872e85b301825a19724aaa45dc9f8.tar.gz | |
Remove the last call in the system to VOP_SPECSTRATEGY(): We can no
longer come through the VNODE layer to the disks since all the filesystems
now go via geom_vfs to GEOM.
| -rw-r--r-- | sys/kern/vfs_bio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 13da4ff..37a6492 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3808,15 +3808,10 @@ bufstrategy(struct bufobj *bo, struct buf *bp) struct vnode *vp; vp = bp->b_vp; -#if 0 - KASSERT(vp == bo->bo_vnode, ("Inconsistent vnode bufstrategy")); + KASSERT(vp == bo->bo_private, ("Inconsistent vnode bufstrategy")); KASSERT(vp->v_type != VCHR && vp->v_type != VBLK, ("Wrong vnode in bufstrategy(bp=%p, vp=%p)", bp, vp)); -#endif - if (vp->v_type == VCHR) - i = VOP_SPECSTRATEGY(vp, bp); - else - i = VOP_STRATEGY(vp, bp); + i = VOP_STRATEGY(vp, bp); KASSERT(i == 0, ("VOP_STRATEGY failed bp=%p vp=%p", bp, bp->b_vp)); } |
