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

Initialize bp->b_offset to the physical offset in partition

Browse Source 
so GEOM knows where to read from disk.
This commit is contained in:
tegge 2003-10-22 18:57:59 +00:00
parent bc68693c2c
commit 3da5a9e5c1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/ufs/ffs/ffs_rawread.c
View File

@ -214,9 +214,8 @@ ffs_rawread_readahead(struct vnode *vp,
bp->b_iodone = ffs_rawreadwakeup; bp->b_iodone = ffs_rawreadwakeup;
bp->b_data = udata; bp->b_data = udata;
bp->b_saveaddr = sa; bp->b_saveaddr = sa;
bp->b_offset = offset; blockno = offset / bsize;
blockno = bp->b_offset / bsize; blockoff = (offset % bsize) / DEV_BSIZE;
blockoff = (bp->b_offset % bsize) / DEV_BSIZE;
if ((daddr_t) blockno != blockno) { if ((daddr_t) blockno != blockno) {
return EINVAL; /* blockno overflow */ return EINVAL; /* blockno overflow */
} }
@ -226,8 +225,7 @@ ffs_rawread_readahead(struct vnode *vp,
error = ufs_bmaparray(vp, bp->b_lblkno, &blkno, NULL, &bforwards, NULL); error = ufs_bmaparray(vp, bp->b_lblkno, &blkno, NULL, &bforwards, NULL);
if (error != 0) if (error != 0)
return error; return error;
bp->b_blkno = blkno; if (blkno == -1) {
if (bp->b_blkno == -1) {
/* Fill holes with NULs to preserve semantics */ /* Fill holes with NULs to preserve semantics */
@ -248,11 +246,12 @@ ffs_rawread_readahead(struct vnode *vp,
bp->b_flags |= B_DONE; bp->b_flags |= B_DONE;
return 0; return 0;
} }
bp->b_blkno = blkno + blockoff;
bp->b_offset = bp->b_iooffset = (blkno + blockoff) * DEV_BSIZE;
if (bp->b_bcount + blockoff * DEV_BSIZE > bsize * (1 + bforwards)) if (bp->b_bcount + blockoff * DEV_BSIZE > bsize * (1 + bforwards))
bp->b_bcount = bsize * (1 + bforwards) - blockoff * DEV_BSIZE; bp->b_bcount = bsize * (1 + bforwards) - blockoff * DEV_BSIZE;
bp->b_bufsize = bp->b_bcount; bp->b_bufsize = bp->b_bcount;
bp->b_blkno += blockoff;
bp->b_dev = dp->v_rdev; bp->b_dev = dp->v_rdev;
if (vmapbuf(bp) < 0) if (vmapbuf(bp) < 0)