summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-07-07 17:17:55 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-07-07 17:17:55 +0000
commit60cd7bca085a4c052cd3a1f3804083531a1f4f15 (patch)
treea5fbb678cd11b0f3a6ad979225cd9b89c1d3e728 /sys
parent9fe706ffdd0084f9b56cf7c5dcc263e77695db31 (diff)
Use b_cylinder instead of a homebrew define.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/disksubr.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index ab4aca46e8c..848f7a23d88 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.38 2000/04/24 04:53:01 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.39 2000/07/07 17:17:54 art Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -45,8 +45,6 @@
#include <sys/syslog.h>
#include <sys/disk.h>
-#define b_cylin b_resid
-
void
dk_establish(dk, dev)
struct disk *dk;
@@ -130,7 +128,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
bp->b_blkno = part_blkno;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
- bp->b_cylin = part_blkno / lp->d_secpercyl;
+ bp->b_cylinder = part_blkno / lp->d_secpercyl;
(*strat)(bp);
/* if successful, wander through dos partition table */
@@ -253,7 +251,7 @@ donot:
/* next, dig out disk label */
bp->b_blkno = dospartoff + LABELSECTOR;
- bp->b_cylin = cyl;
+ bp->b_cylinder = cyl;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
(*strat)(bp);
@@ -302,7 +300,7 @@ donot:
else
bp->b_blkno /= DEV_BSIZE / lp->d_secsize;
bp->b_bcount = lp->d_secsize;
- bp->b_cylin = lp->d_ncylinders - 1;
+ bp->b_cylinder = lp->d_ncylinders - 1;
(*strat)(bp);
/* if successful, validate, otherwise try another */
@@ -417,7 +415,7 @@ writedisklabel(dev, strat, lp, osdep)
bp->b_blkno = DOSBBSECTOR;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
- bp->b_cylin = DOSBBSECTOR / lp->d_secpercyl;
+ bp->b_cylinder = DOSBBSECTOR / lp->d_secpercyl;
(*strat)(bp);
if ((error = biowait(bp)) != 0)
@@ -451,7 +449,7 @@ writedisklabel(dev, strat, lp, osdep)
/* next, dig out disk label */
bp->b_blkno = dospartoff + LABELSECTOR;
- bp->b_cylin = cyl;
+ bp->b_cylinder = cyl;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
(*strat)(bp);
@@ -537,8 +535,8 @@ bounds_check_with_label(bp, lp, osdep, wlabel)
}
/* calculate cylinder for disksort to order transfers with */
- bp->b_cylin = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
- lp->d_secpercyl;
+ bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
+ lp->d_secpercyl;
return (1);
bad: