b_cylin -> b_cylinder; no functional change.

18 files changed, 101 insertions, 137 deletions

diff --git a/sys/arch/amd64/amd64/dkcsum.c b/sys/arch/amd64/amd64/dkcsum.c
index f5ded444a18..4878239e6af 100644
--- a/sys/arch/amd64/amd64/dkcsum.c
+++ b/sys/arch/amd64/amd64/dkcsum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcsum.c,v 1.8 2005/08/01 16:46:55 krw Exp $	*/
+/*	$OpenBSD: dkcsum.c,v 1.9 2006/01/22 00:39:59 miod Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -44,8 +44,6 @@
 
 #include <lib/libz/zlib.h>
 
-#define	b_cylin	b_resid
-
 dev_t dev_rawpart(struct device *);	/* XXX */
 
 extern u_int32_t bios_cksumlen;
@@ -109,7 +107,7 @@ dkcsumattach(void)
 		bp->b_blkno = 0;
 		bp->b_bcount = bios_cksumlen * DEV_BSIZE;
 		bp->b_flags = B_BUSY | B_READ;
-		bp->b_cylin = 0;
+		bp->b_cylinder = 0;
 		(*bdsw->d_strategy)(bp);
 		if ((error = biowait(bp))) {
 			/* XXX What to do here? */
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 24a13b51616..2a083eab0fb 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.38 2006/01/20 23:27:25 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.39 2006/01/22 00:40:01 miod Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -72,8 +72,6 @@
 #define HDPART(x)	DISKPART(x)
 #define HDLABELDEV(d)	MAKEDISKDEV(major(d), HDUNIT(d), RAW_PART)
 
-#define	b_cylin		b_resid
-
 #ifndef	HDRETRY
 #define	HDRETRY		5
 #endif
@@ -690,7 +688,7 @@ hdstrategy(bp)
 			goto bad;
 		}
 	}
-	bp->b_cylin = bn + offset;
+	bp->b_cylinder = bn + offset;
 	s = splbio();
 	disksort(dp, bp);
 	if (dp->b_active == 0) {
@@ -780,7 +778,7 @@ again:
 	rs->sc_ioc.c_volume = C_SVOL(0);
 	rs->sc_ioc.c_saddr = C_SADDR;
 	rs->sc_ioc.c_hiaddr = 0;
-	rs->sc_ioc.c_addr = HDBTOS(bp->b_cylin);
+	rs->sc_ioc.c_addr = HDBTOS(bp->b_cylinder);
 	rs->sc_ioc.c_nop2 = C_NOP;
 	rs->sc_ioc.c_slen = C_SLEN;
 	rs->sc_ioc.c_len = rs->sc_resid;
diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c
index 0d631bbccc2..aefbeeede50 100644
--- a/sys/arch/hp300/hp300/disksubr.c
+++ b/sys/arch/hp300/hp300/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.17 2005/03/30 07:52:31 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.18 2006/01/22 00:40:01 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.9 1997/04/01 03:12:13 scottr Exp $	*/
 
 /*
@@ -44,8 +44,6 @@
 #include <sys/disklabel.h>
 #include <sys/syslog.h>
 
-#define	b_cylinder	b_resid
-
 void
 dk_establish(dk, dev)
 	struct disk *dk;
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index dda6a061762..6e41f509111 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.20 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.21 2006/01/22 00:40:01 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -66,8 +66,6 @@
 #define DISKLABEL_HPPA
 #endif
 
-#define	b_cylin	b_resid
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
@@ -168,7 +166,7 @@ readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly)
 		return (NULL);
 
 	bp->b_blkno = sec;
-	bp->b_cylin = cyl;
+	bp->b_cylinder = cyl;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
 	(*strat)(bp);
@@ -390,7 +388,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, 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 */
@@ -542,7 +540,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 */
@@ -607,7 +605,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 	bp->b_blkno = btodb(LIF_VOLSTART);
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = btodb(LIF_VOLSTART) / lp->d_secpercyl;
+	bp->b_cylinder = btodb(LIF_VOLSTART) / lp->d_secpercyl;
 	(*strat)(bp);
 
 	if (biowait(bp)) {
@@ -632,7 +630,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 		dbp->b_blkno = lifstodb(osdep->u._hppa.lifvol.vol_addr);
 		dbp->b_bcount = lp->d_secsize;
 		dbp->b_flags = B_BUSY | B_READ;
-		dbp->b_cylin = dbp->b_blkno / lp->d_secpercyl;
+		dbp->b_cylinder = dbp->b_blkno / lp->d_secpercyl;
 		(*strat)(dbp);
 
 		if (biowait(dbp)) {
@@ -672,7 +670,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 			dbp->b_blkno = lifstodb(p->dir_addr);
 			dbp->b_bcount = lp->d_secsize;
 			dbp->b_flags = B_BUSY | B_READ;
-			dbp->b_cylin = dbp->b_blkno / lp->d_secpercyl;
+			dbp->b_cylinder = dbp->b_blkno / lp->d_secpercyl;
 			(*strat)(dbp);
 
 			if (biowait(dbp)) {
@@ -900,7 +898,7 @@ writedisklabel(dev, strat, lp, osdep)
 		labeloffset = LABELOFFSET;
 		endian = BYTE_ORDER;
 		bp->b_blkno = partoff + LABELSECTOR;
-		bp->b_cylin = cyl;
+		bp->b_cylinder = cyl;
 		bp->b_bcount = lp->d_secsize;
 	}
 
@@ -979,7 +977,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return (1);
 
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index 829081e59b5..fcbe7c5044f 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.3 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.4 2006/01/22 00:40:01 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -66,8 +66,6 @@
 #define DISKLABEL_HPPA
 #endif
 
-#define	b_cylin	b_resid
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
@@ -168,7 +166,7 @@ readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly)
 		return (NULL);
 
 	bp->b_blkno = sec;
-	bp->b_cylin = cyl;
+	bp->b_cylinder = cyl;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
 	(*strat)(bp);
@@ -386,7 +384,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, 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 */
@@ -538,7 +536,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 */
@@ -603,7 +601,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 	bp->b_blkno = btodb(LIF_VOLSTART);
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = btodb(LIF_VOLSTART) / lp->d_secpercyl;
+	bp->b_cylinder = btodb(LIF_VOLSTART) / lp->d_secpercyl;
 	(*strat)(bp);
 
 	if (biowait(bp)) {
@@ -628,7 +626,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 		dbp->b_blkno = lifstodb(osdep->u._hppa.lifvol.vol_addr);
 		dbp->b_bcount = lp->d_secsize;
 		dbp->b_flags = B_BUSY | B_READ;
-		dbp->b_cylin = dbp->b_blkno / lp->d_secpercyl;
+		dbp->b_cylinder = dbp->b_blkno / lp->d_secpercyl;
 		(*strat)(dbp);
 
 		if (biowait(dbp)) {
@@ -668,7 +666,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 			dbp->b_blkno = lifstodb(p->dir_addr);
 			dbp->b_bcount = lp->d_secsize;
 			dbp->b_flags = B_BUSY | B_READ;
-			dbp->b_cylin = dbp->b_blkno / lp->d_secpercyl;
+			dbp->b_cylinder = dbp->b_blkno / lp->d_secpercyl;
 			(*strat)(dbp);
 
 			if (biowait(dbp)) {
@@ -896,7 +894,7 @@ writedisklabel(dev, strat, lp, osdep)
 		labeloffset = LABELOFFSET;
 		endian = BYTE_ORDER;
 		bp->b_blkno = partoff + LABELSECTOR;
-		bp->b_cylin = cyl;
+		bp->b_cylinder = cyl;
 		bp->b_bcount = lp->d_secsize;
 	}
 
@@ -975,7 +973,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return (1);
 
diff --git a/sys/arch/i386/i386/dkcsum.c b/sys/arch/i386/i386/dkcsum.c
index 850caedf9a1..05141b557db 100644
--- a/sys/arch/i386/i386/dkcsum.c
+++ b/sys/arch/i386/i386/dkcsum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcsum.c,v 1.19 2005/08/01 16:46:55 krw Exp $	*/
+/*	$OpenBSD: dkcsum.c,v 1.20 2006/01/22 00:40:01 miod Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -44,8 +44,6 @@
 
 #include <lib/libz/zlib.h>
 
-#define	b_cylin	b_resid
-
 dev_t dev_rawpart(struct device *);	/* XXX */
 
 extern u_int32_t bios_cksumlen;
@@ -109,7 +107,7 @@ dkcsumattach(void)
 		bp->b_blkno = 0;
 		bp->b_bcount = bios_cksumlen * DEV_BSIZE;
 		bp->b_flags = B_BUSY | B_READ;
-		bp->b_cylin = 0;
+		bp->b_cylinder = 0;
 		(*bdsw->d_strategy)(bp);
 		if ((error = biowait(bp))) {
 			/* XXX What to do here? */
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c
index 01671856ac8..9d7084e7bfc 100644
--- a/sys/arch/mac68k/mac68k/disksubr.c
+++ b/sys/arch/mac68k/mac68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.27 2005/03/30 07:52:32 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.28 2006/01/22 00:40:01 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $	*/
 
 /*
@@ -85,8 +85,6 @@
 
 #include <mac68k/mac68k/dpme.h>	/* MF the structure of a mac partition entry */
 
-#define	b_cylin	b_resid
-
 #define NUM_PARTS_PROBED 32
 
 #define ROOT_PART 1
@@ -396,7 +394,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	bp->b_blkno = LABELSECTOR;
 	bp->b_bcount = size;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = LABELSECTOR / lp->d_secpercyl;
+	bp->b_cylinder = LABELSECTOR / lp->d_secpercyl;
 	(*strat)(bp);
 	if (biowait(bp))
 		msg = "disk label I/O error";
@@ -518,7 +516,7 @@ writedisklabel(dev, strat, lp, osdep)
 	bp->b_blkno = LABELSECTOR;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = LABELSECTOR / lp->d_secpercyl;
+	bp->b_cylinder = LABELSECTOR / lp->d_secpercyl;
 	(*strat)(bp);
 	if ((error = biowait(bp)) != 0)
 		goto done;
@@ -600,7 +598,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return (1);
 
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 490d6f8cc0b..0b7676d496d 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.13 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.14 2006/01/22 00:40:01 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -41,8 +41,6 @@
 #include <sys/syslog.h>
 #include <sys/disk.h>
 
-#define	b_cylin	b_resid
-
 #define BOOT_MAGIC 0xAA55
 #define BOOT_MAGIC_OFF (DOSPARTOFF+NDOSPART*sizeof(struct dos_partition))
 
@@ -109,7 +107,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 	bp->b_blkno = 1;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = 1 / lp->d_secpercyl;
+	bp->b_cylinder = 1 / lp->d_secpercyl;
 	(*strat)(bp);
 
 	/* if successful, wander through DPME partition table */
@@ -133,7 +131,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 		bp->b_blkno = 1+i;
 		bp->b_bcount = lp->d_secsize;
 		bp->b_flags = B_BUSY | B_READ;
-		bp->b_cylin = 1+i / lp->d_secpercyl;
+		bp->b_cylinder = 1+i / lp->d_secpercyl;
 		(*strat)(bp);
 
 		if (biowait(bp)) {
@@ -166,7 +164,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 
 	/* next, dig out disk label */
 	bp->b_blkno = hfspartoff;
-	bp->b_cylin = hfspartoff/lp->d_secpercyl; /* XXX */
+	bp->b_cylinder = hfspartoff/lp->d_secpercyl; /* XXX */
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
 	(*strat)(bp);
@@ -205,7 +203,7 @@ hfs_done:
 			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 */
@@ -333,7 +331,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);
@@ -389,7 +387,7 @@ found_disklabel:
 			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 */
@@ -494,7 +492,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
 		/* only write if a valid "OpenBSD" partition type exists */
 		if (osdep->macparts[1].pmSig == PART_ENTRY_MAGIC) {
 			bp->b_blkno = osdep->macparts[1].pmPyPartStart;
-			bp->b_cylin = bp->b_blkno/lp->d_secpercyl;
+			bp->b_cylinder = bp->b_blkno/lp->d_secpercyl;
 			bp->b_bcount = lp->d_secsize;
 			bp->b_flags = B_BUSY | B_WRITE;
 			*(struct disklabel *)bp->b_data = *lp;
@@ -518,7 +516,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
 		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)
@@ -555,7 +553,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
 
 	/* 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);
@@ -638,7 +636,7 @@ bounds_check_with_label(struct buf *bp, struct disklabel *lp,
 	}
 
 	/* calculate cylinder for disksort to order transfers with */
-	bp->b_cylin = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return (1);
 
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 9399d596e5e..536eeaad725 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.9 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.10 2006/01/22 00:40:01 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -68,8 +68,6 @@
 #define DISKLABEL_SGI
 #endif
 
-#define	b_cylin	b_resid
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
@@ -175,7 +173,7 @@ readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly)
 		return (NULL);
 
 	bp->b_blkno = sec;
-	bp->b_cylin = cyl;
+	bp->b_cylinder = cyl;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
 	(*strat)(bp);
@@ -406,7 +404,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, 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 */
@@ -558,7 +556,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 */
@@ -623,7 +621,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 	bp->b_blkno = btodb(LIF_VOLSTART);
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = btodb(LIF_VOLSTART) / lp->d_secpercyl;
+	bp->b_cylinder = btodb(LIF_VOLSTART) / lp->d_secpercyl;
 	(*strat)(bp);
 
 	if (biowait(bp)) {
@@ -648,7 +646,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 		dbp->b_blkno = lifstodb(osdep->u._hppa.lifvol.vol_addr);
 		dbp->b_bcount = lp->d_secsize;
 		dbp->b_flags = B_BUSY | B_READ;
-		dbp->b_cylin = dbp->b_blkno / lp->d_secpercyl;
+		dbp->b_cylinder = dbp->b_blkno / lp->d_secpercyl;
 		(*strat)(dbp);
 
 		if (biowait(dbp)) {
@@ -688,7 +686,7 @@ readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 			dbp->b_blkno = lifstodb(p->dir_addr);
 			dbp->b_bcount = lp->d_secsize;
 			dbp->b_flags = B_BUSY | B_READ;
-			dbp->b_cylin = dbp->b_blkno / lp->d_secpercyl;
+			dbp->b_cylinder = dbp->b_blkno / lp->d_secpercyl;
 			(*strat)(dbp);
 
 			if (biowait(dbp)) {
@@ -796,7 +794,7 @@ readsgilabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 		*partoffp = -1;
 
 	bp->b_blkno = 0;
-	bp->b_cylin = 0;
+	bp->b_cylinder = 0;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
 	(*strat)(bp);
@@ -1031,7 +1029,7 @@ writedisklabel(dev, strat, lp, osdep)
 		labeloffset = LABELOFFSET;
 		endian = BYTE_ORDER;
 		bp->b_blkno = partoff + LABELSECTOR;
-		bp->b_cylin = cyl;
+		bp->b_cylinder = cyl;
 		bp->b_bcount = lp->d_secsize;
 	}
 
@@ -1110,7 +1108,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return (1);
 
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c
index 3f937b93652..04d389b0363 100644
--- a/sys/arch/mvme68k/mvme68k/disksubr.c
+++ b/sys/arch/mvme68k/mvme68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.32 2006/01/11 07:22:00 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.33 2006/01/22 00:40:01 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -34,8 +34,6 @@
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 
-#define b_cylin b_resid
-
 #ifdef DEBUG
 int disksubr_debug = 0;
 #endif
@@ -103,7 +101,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly)
 	bp->b_blkno = LABELSECTOR;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = 0; /* contained in block 0 */
+	bp->b_cylinder = 0; /* contained in block 0 */
 	(*strat)(bp);
 
 	error = biowait(bp);
@@ -237,7 +235,7 @@ writedisklabel(dev, strat, lp, clp)
 	bp->b_blkno = LABELSECTOR;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = 0; /* contained in block 0 */
+	bp->b_cylinder = 0; /* contained in block 0 */
 	(*strat)(bp);
 
 	if ((error = biowait(bp)) != 0) {
@@ -273,7 +271,7 @@ writedisklabel(dev, strat, lp, clp)
 		bp->b_blkno = 0; /* contained in block 0 */
 		bp->b_bcount = lp->d_secsize;
 		bp->b_flags = B_WRITE;
-		bp->b_cylin = 0; /* contained in block 0 */
+		bp->b_cylinder = 0; /* contained in block 0 */
 		(*strat)(bp);
 
 		error = biowait(bp);
@@ -332,7 +330,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return(1);
 
diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c
index 9a9d5ee5f69..aa93e41e0ef 100644
--- a/sys/arch/mvme88k/mvme88k/disksubr.c
+++ b/sys/arch/mvme88k/mvme88k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.30 2006/01/11 07:22:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.31 2006/01/22 00:40:01 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -34,8 +34,6 @@
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 
-#define b_cylin b_resid
-
 #ifdef DEBUG
 int disksubr_debug;
 #endif
@@ -102,7 +100,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly)
 	bp->b_blkno = LABELSECTOR;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = 0; /* contained in block 0 */
+	bp->b_cylinder = 0; /* contained in block 0 */
 	(*strat)(bp);
 
 	error = biowait(bp);
@@ -235,7 +233,7 @@ writedisklabel(dev, strat, lp, clp)
 	bp->b_blkno = LABELSECTOR;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
-	bp->b_cylin = 0; /* contained in block 0 */
+	bp->b_cylinder = 0; /* contained in block 0 */
 	(*strat)(bp);
 
 	if ((error = biowait(bp)) != 0) {
@@ -271,7 +269,7 @@ writedisklabel(dev, strat, lp, clp)
 		bp->b_blkno = 0; /* contained in block 0 */
 		bp->b_bcount = lp->d_secsize;
 		bp->b_flags = B_WRITE;
-		bp->b_cylin = 0; /* contained in block 0 */
+		bp->b_cylinder = 0; /* contained in block 0 */
 		(*strat)(bp);
 
 		error = biowait(bp);
@@ -330,7 +328,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return(1);
 
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index aa7478f3828..da0ea10300f 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.9 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.10 2006/01/22 00:40:01 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -41,8 +41,6 @@
 #include <sys/syslog.h>
 #include <sys/disk.h>
 
-#define	b_cylin	b_resid
-
 #define BOOT_MAGIC 0xAA55
 #define BOOT_MAGIC_OFF (DOSPARTOFF+NDOSPART*sizeof(struct dos_partition))
 
@@ -127,7 +125,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 */
@@ -251,7 +249,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);
@@ -304,7 +302,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);
@@ -536,7 +534,7 @@ 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)) /
+	bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
 	    lp->d_secpercyl;
 	return (1);
 
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 2ad2d5fa5a1..47f01a2a5af 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.42 2005/08/14 10:58:33 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.43 2006/01/22 00:40:02 miod Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -117,8 +117,6 @@
 /* XXX misuse a flag to identify format operation */
 #define B_FORMAT B_XXX
 
-#define b_cylin b_resid
-
 #ifdef FD_DEBUG
 int	fdc_debug = 0;
 #endif
@@ -744,13 +742,13 @@ fdstrategy(bp)
 		bp->b_bcount = sz << DEV_BSHIFT;
 	}
 
- 	bp->b_cylin = (bp->b_blkno * DEV_BSIZE) /
+ 	bp->b_cylinder = (bp->b_blkno * DEV_BSIZE) /
 	    (FD_BSIZE(fd) * fd->sc_type->seccyl);
 
 #ifdef FD_DEBUG
 	if (fdc_debug > 1)
 	    printf("fdstrategy: b_blkno %d b_bcount %ld blkno %d cylin %ld\n",
-		    bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylin);
+		    bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder);
 #endif
 
 	/* Queue transfer on drive, activate drive and controller if idle. */
@@ -1356,12 +1354,12 @@ loop:
 	doseek:
 		if ((fdc->sc_flags & FDC_EIS) &&
 		    (bp->b_flags & B_FORMAT) == 0) {
-			fd->sc_cylin = bp->b_cylin;
+			fd->sc_cylin = bp->b_cylinder;
 			/* We use implied seek */
 			goto doio;
 		}
 
-		if (fd->sc_cylin == bp->b_cylin)
+		if (fd->sc_cylin == bp->b_cylinder)
 			goto doio;
 
 		fd->sc_cylin = -1;
@@ -1383,7 +1381,7 @@ loop:
 		/* seek function */
 		FDC_WRFIFO(fdc, NE7CMD_SEEK);
 		FDC_WRFIFO(fdc, fd->sc_drive); /* drive number */
-		FDC_WRFIFO(fdc, bp->b_cylin * fd->sc_type->step);
+		FDC_WRFIFO(fdc, bp->b_cylinder * fd->sc_type->step);
 
 		return (1);
 
@@ -1474,7 +1472,7 @@ loop:
 
 		/* Make sure seek really happened. */
 		if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 ||
-		    cyl != bp->b_cylin * fd->sc_type->step) {
+		    cyl != bp->b_cylinder * fd->sc_type->step) {
 #ifdef FD_DEBUG
 			if (fdc_debug)
 				fdcstatus(fdc, "seek failed");
@@ -1482,7 +1480,7 @@ loop:
 			fdcretry(fdc);
 			goto loop;
 		}
-		fd->sc_cylin = bp->b_cylin;
+		fd->sc_cylin = bp->b_cylinder;
 		goto doio;
 
 	case IOTIMEDOUT:
@@ -1590,7 +1588,7 @@ loop:
 		fd->sc_skip += fd->sc_nbytes;
 		fd->sc_bcount -= fd->sc_nbytes;
 		if (finfo == NULL && fd->sc_bcount > 0) {
-			bp->b_cylin = fd->sc_blkno / fd->sc_type->seccyl;
+			bp->b_cylinder = fd->sc_blkno / fd->sc_type->seccyl;
 			goto doseek;
 		}
 		fdfinish(fd, bp);
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index 11ea0a143b4..65a63d00316 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.35 2006/01/20 23:27:25 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.36 2006/01/22 00:40:02 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
 
 /*
@@ -53,8 +53,6 @@ static	char *disklabel_sun_to_bsd(char *, struct disklabel *);
 static	int disklabel_bsd_to_sun(struct disklabel *, char *);
 static __inline u_long sun_extended_sum(struct sun_disklabel *);
 
-#define b_cylin		b_resid
-
 extern struct device *bootdv;
 
 /*
@@ -171,7 +169,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly)
 	/* next, dig out disk label */
 	bp->b_dev = dev;
 	bp->b_blkno = LABELSECTOR;
-	bp->b_cylin = 0;
+	bp->b_cylinder = 0;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_BUSY | B_READ;
 	(*strat)(bp);
@@ -302,7 +300,7 @@ writedisklabel(dev, strat, lp, clp)
 	/* Write out the updated label. */
 	bp->b_dev = dev;
 	bp->b_blkno = LABELSECTOR;
-	bp->b_cylin = 0;
+	bp->b_cylinder = 0;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags = B_WRITE;
 	(*strat)(bp);
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index a52f156a50c..406dc7d7f96 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.4 2005/08/01 12:10:25 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.5 2006/01/22 00:40:02 miod Exp $	*/
 /*	$NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $	*/
 
 /*-
@@ -156,8 +156,6 @@
 /* XXX misuse a flag to identify format operation */
 #define B_FORMAT B_XXX
 
-#define b_cylin b_resid
-
 #ifdef FD_DEBUG
 int	fdc_debug = 0;
 #endif
@@ -743,14 +741,14 @@ fdstrategy(bp)
 		bp->b_bcount = sz << DEV_BSHIFT;
 	}
 
- 	bp->b_cylin = (bp->b_blkno * DEV_BSIZE) /
+ 	bp->b_cylinder = (bp->b_blkno * DEV_BSIZE) /
 	    (FD_BSIZE(fd) * fd->sc_type->seccyl);
 
 #ifdef FD_DEBUG
 	if (fdc_debug > 1)
 	    printf("fdstrategy: b_blkno %lld b_bcount %ld blkno %lld cylin %ld\n",
 		    (long long)bp->b_blkno, bp->b_bcount,
-		    (long long)fd->sc_blkno, bp->b_cylin);
+		    (long long)fd->sc_blkno, bp->b_cylinder);
 #endif
 
 	/* Queue transfer on drive, activate drive and controller if idle. */
@@ -1370,12 +1368,12 @@ loop:
 	doseek:
 		if ((fdc->sc_flags & FDC_EIS) &&
 		    (bp->b_flags & B_FORMAT) == 0) {
-			fd->sc_cylin = bp->b_cylin;
+			fd->sc_cylin = bp->b_cylinder;
 			/* We use implied seek */
 			goto doio;
 		}
 
-		if (fd->sc_cylin == bp->b_cylin)
+		if (fd->sc_cylin == bp->b_cylinder)
 			goto doio;
 
 		fd->sc_cylin = -1;
@@ -1397,7 +1395,7 @@ loop:
 		/* seek function */
 		FDC_WRFIFO(fdc, NE7CMD_SEEK);
 		FDC_WRFIFO(fdc, fd->sc_drive); /* drive number */
-		FDC_WRFIFO(fdc, bp->b_cylin * fd->sc_type->step);
+		FDC_WRFIFO(fdc, bp->b_cylinder * fd->sc_type->step);
 		return (1);
 
 	case DODSKCHG:
@@ -1525,7 +1523,7 @@ loop:
 
 		/* Make sure seek really happened. */
 		if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 ||
-		    cyl != bp->b_cylin * fd->sc_type->step) {
+		    cyl != bp->b_cylinder * fd->sc_type->step) {
 #ifdef FD_DEBUG
 			if (fdc_debug)
 				fdcstatus(fdc, "seek failed");
@@ -1533,7 +1531,7 @@ loop:
 			fdcretry(fdc);
 			goto loop;
 		}
-		fd->sc_cylin = bp->b_cylin;
+		fd->sc_cylin = bp->b_cylinder;
 		goto doio;
 
 	case IOTIMEDOUT:
@@ -1642,7 +1640,7 @@ loop:
 		fd->sc_skip += fd->sc_nbytes;
 		fd->sc_bcount -= fd->sc_nbytes;
 		if (finfo == NULL && fd->sc_bcount > 0) {
-			bp->b_cylin = fd->sc_blkno / fd->sc_type->seccyl;
+			bp->b_cylinder = fd->sc_blkno / fd->sc_type->seccyl;
 			goto doseek;
 		}
 		fdfinish(fd, bp);
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index c5d812f9ce9..ef58b4e79ca 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.51 2005/09/19 01:28:04 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.52 2006/01/22 00:40:02 miod Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -79,8 +79,6 @@
 /* XXX misuse a flag to identify format operation */
 #define B_FORMAT B_XXX
 
-#define b_cylin b_resid
-
 /* fd_type struct now in ioctl_fd.h */
 
 /* The order of entries in the following table is important -- BEWARE! */
@@ -381,11 +379,11 @@ fdstrategy(bp)
 		bp->b_bcount = sz << DEV_BSHIFT;
 	}
 
- 	bp->b_cylin = bp->b_blkno / (fd_bsize / DEV_BSIZE) / fd->sc_type->seccyl;
+ 	bp->b_cylinder = bp->b_blkno / (fd_bsize / DEV_BSIZE) / fd->sc_type->seccyl;
 
 #ifdef FD_DEBUG
 	printf("fdstrategy: b_blkno %d b_bcount %d blkno %d cylin %d sz %d\n",
-	    bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylin, sz);
+	    bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder, sz);
 #endif
 
 	/* Queue transfer on drive, activate drive and controller if idle. */
@@ -676,7 +674,7 @@ loop:
 		/* fall through */
 	case DOSEEK:
 	doseek:
-		if (fd->sc_cylin == bp->b_cylin)
+		if (fd->sc_cylin == bp->b_cylinder)
 			goto doio;
 
 		out_fdc(iot, ioh, NE7CMD_SPECIFY);/* specify command */
@@ -685,7 +683,7 @@ loop:
 
 		out_fdc(iot, ioh, NE7CMD_SEEK);	/* seek function */
 		out_fdc(iot, ioh, fd->sc_drive);	/* drive number */
-		out_fdc(iot, ioh, bp->b_cylin * fd->sc_type->step);
+		out_fdc(iot, ioh, bp->b_cylinder * fd->sc_type->step);
 
 		fd->sc_cylin = -1;
 		fdc->sc_state = SEEKWAIT;
@@ -776,14 +774,14 @@ loop:
 		/* Make sure seek really happened. */
 		out_fdc(iot, ioh, NE7CMD_SENSEI);
 		if (fdcresult(fdc) != 2 || (st0 & 0xf8) != 0x20 ||
-		    cyl != bp->b_cylin * fd->sc_type->step) {
+		    cyl != bp->b_cylinder * fd->sc_type->step) {
 #ifdef FD_DEBUG
 			fdcstatus(&fd->sc_dev, 2, "seek failed");
 #endif
 			fdretry(fd);
 			goto loop;
 		}
-		fd->sc_cylin = bp->b_cylin;
+		fd->sc_cylin = bp->b_cylinder;
 		goto doio;
 
 	case IOTIMEDOUT:
@@ -823,7 +821,7 @@ loop:
 		fd->sc_skip += fd->sc_nbytes;
 		fd->sc_bcount -= fd->sc_nbytes;
 		if (!finfo && fd->sc_bcount > 0) {
-			bp->b_cylin = fd->sc_blkno / fd->sc_type->seccyl;
+			bp->b_cylinder = fd->sc_blkno / fd->sc_type->seccyl;
 			goto doseek;
 		}
 		fdfinish(fd, bp);
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index a472e510bcb..ec6e527ac63 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.57 2005/12/29 20:02:03 pedro Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.58 2006/01/22 00:40:02 miod Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -93,8 +93,6 @@ int vnddebug = 0x00;
 #define	VDB_IO		0x04
 #endif
 
-#define	b_cylin	b_resid
-
 /*
  * vndunit is a bit weird.  have to reconstitute the dev_t for
  * DISKUNIT(), but with the minor masked off.
@@ -614,7 +612,7 @@ vndstrategy(bp)
 		/*
 		 * Just sort by block number
 		 */
-		nbp->vb_buf.b_cylin = nbp->vb_buf.b_blkno;
+		nbp->vb_buf.b_cylinder = nbp->vb_buf.b_blkno;
 		s = splbio();
 		disksort(&vnd->sc_tab, &nbp->vb_buf);
 		if (vnd->sc_tab.b_active < vnd->sc_maxactive) {
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 9237848f7f0..20c0f381537 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.37 2005/11/30 10:35:07 pedro Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.38 2006/01/22 00:40:02 miod Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -55,8 +55,6 @@
 #include <sys/malloc.h>
 #include <sys/stat.h>
 
-#define	b_cylin	b_resid
-
 #include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_extern.h>
 #include <isofs/cd9660/iso_rrip.h>
@@ -466,7 +464,7 @@ iso_disklabelspoof(dev, strat, lp)
 		bp->b_blkno = iso_blknum * btodb(ISO_DEFAULT_BLOCK_SIZE);
 		bp->b_bcount = ISO_DEFAULT_BLOCK_SIZE;
 		bp->b_flags = B_BUSY | B_READ;
-		bp->b_cylin = bp->b_blkno / lp->d_secpercyl;
+		bp->b_cylinder = bp->b_blkno / lp->d_secpercyl;
 
 		/*printf("d_secsize %d iso_blknum %d b_blkno %d bcount %d\n",
 		    lp->d_secsize, iso_blknum, bp->b_blkno, bp->b_bcount);*/