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

Replace B_PHYS conditional assignment to bio_offset with KASSERT check

Browse Source 
to see that the originating code already did it right.
This commit is contained in:
phk 2003-11-12 10:27:06 +00:00
parent c6eb0ef360
commit 70388f65e9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/vfs_bio.c
View File

@ -3077,9 +3077,14 @@ dev_strategy(struct buf *bp)
if ((!bp->b_iocmd) || (bp->b_iocmd & (bp->b_iocmd - 1)))
panic("b_iocmd botch");
if (bp->b_flags & B_PHYS)
bp->b_io.bio_offset = bp->b_offset;
KASSERT(bp->b_io.bio_offset == bp->b_offset,
("bio_offset %jd wrong, should be %jd",
(intmax_t)bp->b_io.bio_offset, (intmax_t)bp->b_offset));
else
bp->b_io.bio_offset = dbtob(bp->b_blkno);
KASSERT(bp->b_io.bio_offset == dbtob(bp->b_blkno),
("bio_offset %jd wrong, should be %jd",
(intmax_t)bp->b_io.bio_offset,
(intmax_t)dbtob(bp->b_blkno)));
bp->b_io.bio_done = bufdonebio;
bp->b_io.bio_caller2 = bp;
(*devsw(bp->b_io.bio_dev)->d_strategy)(&bp->b_io);