Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use b_cylinder as defined in sys/buf.h

This commit is contained in:
thorpej 2000-01-18 19:46:07 +00:00
parent aff651d2c6
commit 8808155fa6
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/newsmips/newsmips/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.2 1998/06/01 19:31:05 tsubai Exp $ */
/* $NetBSD: disksubr.c,v 1.3 2000/01/18 19:46:07 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -43,8 +43,6 @@
#include <sys/disklabel.h>
#include <sys/syslog.h>
#define b_cylin b_resid
char* readdisklabel __P((dev_t dev, void (*strat) __P((struct buf *bp)),
register struct disklabel *lp,
struct cpu_disklabel *osdep));
@ -80,7 +78,7 @@ readdisklabel(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 (biowait(bp)) {
msg = "I/O error";

8
sys/arch/pc532/pc532/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.14 1998/04/21 20:12:17 matthias Exp $ */
/* $NetBSD: disksubr.c,v 1.15 2000/01/18 19:46:35 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -50,8 +50,6 @@
#include <machine/autoconf.h>
#define b_cylin b_resid
/*
* Attempt to read a disk label from a device
* using the indicated stategy routine.
@ -83,7 +81,7 @@ readdisklabel(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 (biowait(bp)) {
msg = "I/O error";
@ -240,7 +238,7 @@ bounds_check_with_label(struct buf *bp, struct disklabel *lp, int wlabel)
}
/* calculate cylinder for disksort to order transfers with */
bp->b_cylin = (bp->b_blkno + p->p_offset) / lp->d_secpercyl;
bp->b_cylinder = (bp->b_blkno + p->p_offset) / lp->d_secpercyl;
return(1);
bad: