diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-20 18:15:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-20 18:15:48 +0000 |
| commit | 873db335f698dc92ad5bb1724185b94b78cadc90 (patch) | |
| tree | 5d88760d74825983a6db073cbf8f2208063bb6cc /sys/arch/arm | |
| parent | fca02c516c82caf63d1f863db7e8b1b418f4cb66 (diff) | |
b_cylinder does not need to be set on the callpath down into drivers.
cpu_disklabel can go away, since nothing anymore needs to use it; ok miod
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/arm/disksubr.c | 14 | ||||
| -rw-r--r-- | sys/arch/arm/include/disklabel.h | 5 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c index 8b98f732e10..d95277a2bf6 100644 --- a/sys/arch/arm/arm/disksubr.c +++ b/sys/arch/arm/arm/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.47 2007/06/18 07:11:01 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.48 2007/06/20 18:15:45 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -57,7 +57,7 @@ */ char * readdisklabel(dev_t dev, void (*strat)(struct buf *), - struct disklabel *lp, struct cpu_disklabel *osdep, int spoofonly) + struct disklabel *lp, int spoofonly) { struct buf *bp = NULL; char *msg; @@ -69,7 +69,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; - msg = readdoslabel(bp, strat, lp, osdep, NULL, NULL, spoofonly); + msg = readdoslabel(bp, strat, lp, NULL, spoofonly); if (msg == NULL) goto done; @@ -98,10 +98,9 @@ done: * Write disk label back to device after modification. */ int -writedisklabel(dev_t dev, void (*strat)(struct buf *), - struct disklabel *lp, struct cpu_disklabel *osdep) +writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp) { - int error = EIO, partoff = -1, cyl = 0; + int error = EIO, partoff = -1; struct disklabel *dlp; struct buf *bp = NULL; @@ -109,12 +108,11 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; - if (readdoslabel(bp, strat, lp, osdep, &partoff, &cyl, 1) != NULL) + if (readdoslabel(bp, strat, lp, &partoff, 1) != NULL) goto done; /* Read it in, slap the new label in, and write it back out */ bp->b_blkno = partoff + LABELSECTOR; - bp->b_cylinder = cyl; bp->b_bcount = lp->d_secsize; bp->b_flags = B_BUSY | B_READ; (*strat)(bp); diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h index 621c3ae8de1..f4d66b2165e 100644 --- a/sys/arch/arm/include/disklabel.h +++ b/sys/arch/arm/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.12 2007/06/17 00:27:26 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.13 2007/06/20 18:15:45 deraadt Exp $ */ /* * Copyright (c) 1994 Mark Brinicombe. @@ -42,7 +42,4 @@ #define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ -struct cpu_disklabel { -}; - #endif /* _ARM_DISKLABEL_H_ */ |