diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-10-27 06:48:21 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-10-27 06:48:21 +0000 |
| commit | d83b7498a4dd58ea62b1ebb1724047cd84176357 (patch) | |
| tree | 59e4b9cc1138a6536a4c0b9b13ba5009fc6189c9 /sys/gnu | |
| parent | 5b285effb04c48e4e70e33fca9651c7e322ca98f (diff) | |
Notes
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_subr.c | 3 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vnops.c | 2 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_subr.c | 3 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vnops.c | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c index 94db9346b7c0..7c7d33341152 100644 --- a/sys/gnu/ext2fs/ext2_subr.c +++ b/sys/gnu/ext2fs/ext2_subr.c @@ -103,8 +103,7 @@ ext2_checkoverlap(bp, ip) start = bp->b_blkno; last = start + btodb(bp->b_bcount) - 1; for (ep = buf; ep < ebp; ep++) { - if (ep == bp || (ep->b_flags & B_INVAL) || - ep->b_vp == NULLVP) + if (ep == bp || (ep->b_flags & B_INVAL)) continue; vp = ip->i_devvp; /* look for overlap */ diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index 2da67779f1a4..5e807c64dc40 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -1424,8 +1424,6 @@ 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"); diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c index 94db9346b7c0..7c7d33341152 100644 --- a/sys/gnu/fs/ext2fs/ext2_subr.c +++ b/sys/gnu/fs/ext2fs/ext2_subr.c @@ -103,8 +103,7 @@ ext2_checkoverlap(bp, ip) start = bp->b_blkno; last = start + btodb(bp->b_bcount) - 1; for (ep = buf; ep < ebp; ep++) { - if (ep == bp || (ep->b_flags & B_INVAL) || - ep->b_vp == NULLVP) + if (ep == bp || (ep->b_flags & B_INVAL)) continue; vp = ip->i_devvp; /* look for overlap */ diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index 2da67779f1a4..5e807c64dc40 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -1424,8 +1424,6 @@ 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"); |