diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1996-12-01 16:34:41 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1996-12-01 16:34:41 +0000 |
| commit | 4eb73cdafffefcf65741a80033ac3d9815e54c5b (patch) | |
| tree | 2dd3ab4d8da334245d122c8d10db460d0d47fb9e /sys/kern | |
| parent | 4958bbd17589233e18bd939384639b4bb719818b (diff) | |
Notes
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_disklabel.c | 10 | ||||
| -rw-r--r-- | sys/kern/subr_diskslice.c | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index fc1e24e67216..6221df0a985c 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.26 1996/09/20 17:39:44 bde Exp $ + * $Id: ufs_disksubr.c,v 1.27 1996/12/01 11:25:10 sos Exp $ */ #include <sys/param.h> @@ -62,13 +62,6 @@ * allocated. */ -/* - * For portability with historic industry practice, the - * cylinder number has to be maintained in the `b_resid' - * field. - */ -#define b_cylinder b_resid - void tqdisksort(ap, bp) struct buf_queue_head *ap; @@ -186,7 +179,6 @@ readdisklabel(dev, strat, lp) bp->b_bcount = lp->d_secsize; bp->b_flags &= ~B_INVAL; bp->b_flags |= B_BUSY | B_READ; - bp->b_cylinder = LABELSECTOR / lp->d_secpercyl; (*strat)(bp); if (biowait(bp)) msg = "I/O error"; diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 644eb64ca973..73f738381ef6 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.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_diskslice.c,v 1.30 1996/10/29 13:15:30 bde Exp $ + * $Id: subr_diskslice.c,v 1.31 1996/12/01 11:25:00 sos Exp $ */ #include <sys/param.h> @@ -65,8 +65,6 @@ #include <ufs/ffs/fs.h> -#define b_cylinder b_resid - #define TRACE(str) do { if (ds_debug) printf str; } while (0) typedef u_char bool_t; @@ -185,12 +183,7 @@ if (labelsect != 0) Debugger("labelsect != 0 in dscheck()"); bp->b_bcount = sz << DEV_BSHIFT; } - /* calculate cylinder for disksort to order transfers with */ bp->b_pblkno = blkno + sp->ds_offset; - if (lp == NULL) - bp->b_cylinder = 0; /* XXX always 0 would be better */ - else - bp->b_cylinder = bp->b_pblkno / lp->d_secpercyl; /* * Snoop on label accesses if the slice offset is nonzero. Fudge |