diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_diskmbr.c | 8 | ||||
| -rw-r--r-- | sys/kern/subr_dkbad.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index df94edf..95e89d0 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.25 1997/04/19 14:14:17 bde Exp $ + * $Id: diskslice_machdep.c,v 1.26 1997/09/27 15:34:34 joerg Exp $ */ #include <stddef.h> @@ -207,7 +207,7 @@ reread_mbr: } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { @@ -398,7 +398,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); @@ -409,7 +409,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } for (dospart = 0, - dp = (struct dos_partition *)(bp->b_un.b_addr + DOSPARTOFF), + dp = (struct dos_partition *)(bp->b_data + DOSPARTOFF), slice = ssp->dss_nslices, sp = &ssp->dss_slices[slice]; dospart < NDOSPART; dospart++, dp++) { ext_sizes[dospart] = 0; diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c index f2857c8..4686a17 100644 --- a/sys/kern/subr_dkbad.c +++ b/sys/kern/subr_dkbad.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_dkbad.c,v 1.6 1997/02/22 09:39:16 peter Exp $ + * $Id: subr_dkbad.c,v 1.7 1997/11/24 04:14:21 dyson Exp $ */ #include <sys/param.h> @@ -123,7 +123,7 @@ readbad144(dev, strat, lp, bdp) /* If successful, validate, otherwise try another. */ if (biowait(bp) == 0) { - db = (struct dkbad *)(bp->b_un.b_addr); + db = (struct dkbad *)(bp->b_data); if (db->bt_mbz == 0 && db->bt_flag == DKBAD_MAGIC) { msg = NULL; *bdp = *db; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8c4c9ca..2214fb8 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.135 1997/11/24 06:18:27 dyson Exp $ + * $Id: vfs_bio.c,v 1.136 1997/12/01 19:04:00 dyson Exp $ */ /* @@ -2233,10 +2233,10 @@ DB_SHOW_COMMAND(buffer, db_show_buffer) "\17locked\16inval\15gathered\14error\13eintr\12done\11dirty" "\10delwri\7call\6cache\5busy\4bad\3async\2needcommit\1age"); db_printf("b_error = %d, b_bufsize = %ld, b_bcount = %ld, " - "b_resid = %ld\nb_dev = 0x%x, b_un.b_addr = %p, " + "b_resid = %ld\nb_dev = 0x%x, b_data = %p, " "b_blkno = %d, b_pblkno = %d\n", bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid, - bp->b_dev, bp->b_un.b_addr, bp->b_blkno, bp->b_pblkno); + bp->b_dev, bp->b_data, bp->b_blkno, bp->b_pblkno); if (bp->b_npages) { int i; db_printf("b_npages = %d, pages(OBJ, IDX, PA): ", bp->b_npages); |
