summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2001-05-01 09:12:05 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2001-05-01 09:12:05 +0000
commitcf94807d033c9cee7aabfaa60bb97d8804bf5935 (patch)
tree36f081fe6a85cb10e5d6fb2fd3fd6aa958f5dd8f
parent573fbdc21f0481e500a43a5f5035e284813e5af1 (diff)
Notes
-rw-r--r--sys/gnu/ext2fs/ext2_subr.c5
-rw-r--r--sys/gnu/fs/ext2fs/ext2_subr.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index fe7c662f02d3..49210b00d562 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -114,10 +114,7 @@ ext2_checkoverlap(bp, ip)
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, NULL, NULL))
- continue;
- if (vp != ip->i_devvp)
- continue;
+ vp = ip->i_devvp;
/* look for overlap */
if (ep->b_bcount == 0 || ep->b_blkno > last ||
ep->b_blkno + btodb(ep->b_bcount) <= start)
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index fe7c662f02d3..49210b00d562 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -114,10 +114,7 @@ ext2_checkoverlap(bp, ip)
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, NULL, NULL))
- continue;
- if (vp != ip->i_devvp)
- continue;
+ vp = ip->i_devvp;
/* look for overlap */
if (ep->b_bcount == 0 || ep->b_blkno > last ||
ep->b_blkno + btodb(ep->b_bcount) <= start)