Normalize label handling.

This commit is contained in:
mycroft 1994-07-26 19:36:06 +00:00
parent 233b5d12f4
commit b5ce4d0cdd
4 changed files with 75 additions and 60 deletions

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.48 1994/06/16 01:08:18 mycroft Exp $ * $Id: fd.c,v 1.49 1994/07/26 19:36:06 mycroft Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -70,8 +70,8 @@
#include <i386/isa/rtc.h> #include <i386/isa/rtc.h>
#endif #endif
#define FDUNIT(s) (minor(s)>>3) #define FDUNIT(dev) (minor(dev) / 8)
#define FDTYPE(s) (minor(s)&7) #define FDTYPE(dev) (minor(dev) % 8)
#define b_cylin b_resid #define b_cylin b_resid

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.85 1994/07/21 23:44:16 mycroft Exp $ * $Id: wd.c,v 1.86 1994/07/26 19:36:13 mycroft Exp $
*/ */
#define INSTRUMENT /* instrumentation stuff by Brad Parker */ #define INSTRUMENT /* instrumentation stuff by Brad Parker */
@ -82,10 +82,14 @@
#define WDIORETRIES 5 /* number of retries before giving up */ #define WDIORETRIES 5 /* number of retries before giving up */
#define WDUNIT(dev) ((minor(dev) & 0xf8) >> 3) #define WDUNIT(dev) (minor(dev) / MAXPARTITIONS)
#define WDPART(dev) ((minor(dev) & 0x07) ) #define WDPART(dev) (minor(dev) % MAXPARTITIONS)
#define makewddev(maj, unit, part) (makedev(maj, ((unit << 3) + part))) #define makewddev(maj, unit, part) \
#define WDRAW 3 /* 'd' partition isn't a partition! */ (makedev((maj), ((unit) * MAXPARTITIONS) + (part)))
#ifndef RAW_PART
#define RAW_PART 3 /* XXX should be 2 */
#endif
#define WDLABELDEV(dev) (makewddev(major(dev), WDUNIT(dev), RAW_PART))
#define b_cylin b_resid /* cylinder number for doing IO to */ #define b_cylin b_resid /* cylinder number for doing IO to */
/* shares an entry in the buf struct */ /* shares an entry in the buf struct */
@ -359,7 +363,8 @@ wdstrategy(bp)
} }
/* Have partitions and want to use them? */ /* Have partitions and want to use them? */
if ((wd->sc_flags & WDF_BSDLABEL) != 0 && WDPART(bp->b_dev) != WDRAW) { if ((wd->sc_flags & WDF_BSDLABEL) != 0 &&
WDPART(bp->b_dev) != RAW_PART) {
/* /*
* Do bounds checking, adjust transfer. if error, process. * Do bounds checking, adjust transfer. if error, process.
* If end of partition, just return. * If end of partition, just return.
@ -572,7 +577,8 @@ loop:
lp = &wd->sc_label; lp = &wd->sc_label;
secpertrk = lp->d_nsectors; secpertrk = lp->d_nsectors;
secpercyl = lp->d_secpercyl; secpercyl = lp->d_secpercyl;
if ((wd->sc_flags & WDF_BSDLABEL) != 0 && WDPART(bp->b_dev) != WDRAW) if ((wd->sc_flags & WDF_BSDLABEL) != 0 &&
WDPART(bp->b_dev) != RAW_PART)
blknum += lp->d_partitions[WDPART(bp->b_dev)].p_offset; blknum += lp->d_partitions[WDPART(bp->b_dev)].p_offset;
cylin = blknum / secpercyl; cylin = blknum / secpercyl;
head = (blknum % secpercyl) / secpertrk; head = (blknum % secpercyl) / secpertrk;
@ -843,8 +849,8 @@ wdopen(dev, flag, fmt, p)
wd->sc_state = RECAL; wd->sc_state = RECAL;
/* Read label using "raw" partition. */ /* Read label using "raw" partition. */
msg = readdisklabel(makewddev(major(dev), WDUNIT(dev), WDRAW), msg = readdisklabel(WDLABELDEV(dev), wdstrategy, &wd->sc_label,
wdstrategy, &wd->sc_label, &wd->sc_cpulabel); &wd->sc_cpulabel);
if (msg) { if (msg) {
/* /*
* This probably happened because the drive's default * This probably happened because the drive's default
@ -854,14 +860,13 @@ wdopen(dev, flag, fmt, p)
*/ */
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
msg = readdisklabel(makewddev(major(dev), WDUNIT(dev), msg = readdisklabel(WDLABELDEV(dev), wdstrategy,
WDRAW), wdstrategy, &wd->sc_label, &wd->sc_label, &wd->sc_cpulabel);
&wd->sc_cpulabel);
} }
if (msg) { if (msg) {
log(LOG_WARNING, "%s: cannot find label (%s)\n", log(LOG_WARNING, "%s: cannot find label (%s)\n",
wd->sc_dev.dv_xname, msg); wd->sc_dev.dv_xname, msg);
if (part != WDRAW) if (part != RAW_PART)
return EINVAL; /* XXX needs translation */ return EINVAL; /* XXX needs translation */
} else { } else {
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
@ -880,7 +885,7 @@ wdopen(dev, flag, fmt, p)
* Warn if a partition is opened that overlaps another partition which * Warn if a partition is opened that overlaps another partition which
* is open unless one is the "raw" partition (whole disk). * is open unless one is the "raw" partition (whole disk).
*/ */
if ((wd->sc_openpart & mask) == 0 && part != WDRAW) { if ((wd->sc_openpart & mask) == 0 && part != RAW_PART) {
int start, end; int start, end;
pp = &wd->sc_label.d_partitions[part]; pp = &wd->sc_label.d_partitions[part];
@ -892,7 +897,7 @@ wdopen(dev, flag, fmt, p)
if (pp->p_offset + pp->p_size <= start || if (pp->p_offset + pp->p_size <= start ||
pp->p_offset >= end) pp->p_offset >= end)
continue; continue;
if (pp - wd->sc_label.d_partitions == WDRAW) if (pp - wd->sc_label.d_partitions == RAW_PART)
continue; continue;
if (wd->sc_openpart & (1 << (pp - wd->sc_label.d_partitions))) if (wd->sc_openpart & (1 << (pp - wd->sc_label.d_partitions)))
log(LOG_WARNING, log(LOG_WARNING,
@ -901,7 +906,7 @@ wdopen(dev, flag, fmt, p)
pp - wd->sc_label.d_partitions + 'a'); pp - wd->sc_label.d_partitions + 'a');
} }
} }
if (part >= wd->sc_label.d_npartitions && part != WDRAW) if (part >= wd->sc_label.d_npartitions && part != RAW_PART)
return ENXIO; return ENXIO;
/* Insure only one open at a time. */ /* Insure only one open at a time. */
@ -1207,8 +1212,8 @@ wdioctl(dev, cmd, addr, flag, p)
wd->sc_openpart |= (1 << 0); /* XXX */ wd->sc_openpart |= (1 << 0); /* XXX */
wlab = wd->sc_wlabel; wlab = wd->sc_wlabel;
wd->sc_wlabel = 1; wd->sc_wlabel = 1;
error = writedisklabel(dev, wdstrategy, &wd->sc_label, error = writedisklabel(WDLABELDEV(dev), wdstrategy,
&wd->sc_cpulabel); &wd->sc_label, &wd->sc_cpulabel);
wd->sc_openpart = wd->sc_copenpart | wd->sc_bopenpart; wd->sc_openpart = wd->sc_copenpart | wd->sc_bopenpart;
wd->sc_wlabel = wlab; wd->sc_wlabel = wlab;
} }
@ -1280,7 +1285,7 @@ wdsize(dev)
if (wd->sc_state < OPEN || (wd->sc_flags & WDF_BSDLABEL) == 0) { if (wd->sc_state < OPEN || (wd->sc_flags & WDF_BSDLABEL) == 0) {
int val; int val;
val = wdopen(makewddev(major(dev), lunit, WDRAW), FREAD, val = wdopen(makewddev(major(dev), lunit, RAW_PART), FREAD,
S_IFBLK, 0); S_IFBLK, 0);
/* XXX Clear the open flag? */ /* XXX Clear the open flag? */
if (val != 0) if (val != 0)

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.85 1994/07/21 23:44:16 mycroft Exp $ * $Id: wd.c,v 1.86 1994/07/26 19:36:13 mycroft Exp $
*/ */
#define INSTRUMENT /* instrumentation stuff by Brad Parker */ #define INSTRUMENT /* instrumentation stuff by Brad Parker */
@ -82,10 +82,14 @@
#define WDIORETRIES 5 /* number of retries before giving up */ #define WDIORETRIES 5 /* number of retries before giving up */
#define WDUNIT(dev) ((minor(dev) & 0xf8) >> 3) #define WDUNIT(dev) (minor(dev) / MAXPARTITIONS)
#define WDPART(dev) ((minor(dev) & 0x07) ) #define WDPART(dev) (minor(dev) % MAXPARTITIONS)
#define makewddev(maj, unit, part) (makedev(maj, ((unit << 3) + part))) #define makewddev(maj, unit, part) \
#define WDRAW 3 /* 'd' partition isn't a partition! */ (makedev((maj), ((unit) * MAXPARTITIONS) + (part)))
#ifndef RAW_PART
#define RAW_PART 3 /* XXX should be 2 */
#endif
#define WDLABELDEV(dev) (makewddev(major(dev), WDUNIT(dev), RAW_PART))
#define b_cylin b_resid /* cylinder number for doing IO to */ #define b_cylin b_resid /* cylinder number for doing IO to */
/* shares an entry in the buf struct */ /* shares an entry in the buf struct */
@ -359,7 +363,8 @@ wdstrategy(bp)
} }
/* Have partitions and want to use them? */ /* Have partitions and want to use them? */
if ((wd->sc_flags & WDF_BSDLABEL) != 0 && WDPART(bp->b_dev) != WDRAW) { if ((wd->sc_flags & WDF_BSDLABEL) != 0 &&
WDPART(bp->b_dev) != RAW_PART) {
/* /*
* Do bounds checking, adjust transfer. if error, process. * Do bounds checking, adjust transfer. if error, process.
* If end of partition, just return. * If end of partition, just return.
@ -572,7 +577,8 @@ loop:
lp = &wd->sc_label; lp = &wd->sc_label;
secpertrk = lp->d_nsectors; secpertrk = lp->d_nsectors;
secpercyl = lp->d_secpercyl; secpercyl = lp->d_secpercyl;
if ((wd->sc_flags & WDF_BSDLABEL) != 0 && WDPART(bp->b_dev) != WDRAW) if ((wd->sc_flags & WDF_BSDLABEL) != 0 &&
WDPART(bp->b_dev) != RAW_PART)
blknum += lp->d_partitions[WDPART(bp->b_dev)].p_offset; blknum += lp->d_partitions[WDPART(bp->b_dev)].p_offset;
cylin = blknum / secpercyl; cylin = blknum / secpercyl;
head = (blknum % secpercyl) / secpertrk; head = (blknum % secpercyl) / secpertrk;
@ -843,8 +849,8 @@ wdopen(dev, flag, fmt, p)
wd->sc_state = RECAL; wd->sc_state = RECAL;
/* Read label using "raw" partition. */ /* Read label using "raw" partition. */
msg = readdisklabel(makewddev(major(dev), WDUNIT(dev), WDRAW), msg = readdisklabel(WDLABELDEV(dev), wdstrategy, &wd->sc_label,
wdstrategy, &wd->sc_label, &wd->sc_cpulabel); &wd->sc_cpulabel);
if (msg) { if (msg) {
/* /*
* This probably happened because the drive's default * This probably happened because the drive's default
@ -854,14 +860,13 @@ wdopen(dev, flag, fmt, p)
*/ */
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
msg = readdisklabel(makewddev(major(dev), WDUNIT(dev), msg = readdisklabel(WDLABELDEV(dev), wdstrategy,
WDRAW), wdstrategy, &wd->sc_label, &wd->sc_label, &wd->sc_cpulabel);
&wd->sc_cpulabel);
} }
if (msg) { if (msg) {
log(LOG_WARNING, "%s: cannot find label (%s)\n", log(LOG_WARNING, "%s: cannot find label (%s)\n",
wd->sc_dev.dv_xname, msg); wd->sc_dev.dv_xname, msg);
if (part != WDRAW) if (part != RAW_PART)
return EINVAL; /* XXX needs translation */ return EINVAL; /* XXX needs translation */
} else { } else {
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
@ -880,7 +885,7 @@ wdopen(dev, flag, fmt, p)
* Warn if a partition is opened that overlaps another partition which * Warn if a partition is opened that overlaps another partition which
* is open unless one is the "raw" partition (whole disk). * is open unless one is the "raw" partition (whole disk).
*/ */
if ((wd->sc_openpart & mask) == 0 && part != WDRAW) { if ((wd->sc_openpart & mask) == 0 && part != RAW_PART) {
int start, end; int start, end;
pp = &wd->sc_label.d_partitions[part]; pp = &wd->sc_label.d_partitions[part];
@ -892,7 +897,7 @@ wdopen(dev, flag, fmt, p)
if (pp->p_offset + pp->p_size <= start || if (pp->p_offset + pp->p_size <= start ||
pp->p_offset >= end) pp->p_offset >= end)
continue; continue;
if (pp - wd->sc_label.d_partitions == WDRAW) if (pp - wd->sc_label.d_partitions == RAW_PART)
continue; continue;
if (wd->sc_openpart & (1 << (pp - wd->sc_label.d_partitions))) if (wd->sc_openpart & (1 << (pp - wd->sc_label.d_partitions)))
log(LOG_WARNING, log(LOG_WARNING,
@ -901,7 +906,7 @@ wdopen(dev, flag, fmt, p)
pp - wd->sc_label.d_partitions + 'a'); pp - wd->sc_label.d_partitions + 'a');
} }
} }
if (part >= wd->sc_label.d_npartitions && part != WDRAW) if (part >= wd->sc_label.d_npartitions && part != RAW_PART)
return ENXIO; return ENXIO;
/* Insure only one open at a time. */ /* Insure only one open at a time. */
@ -1207,8 +1212,8 @@ wdioctl(dev, cmd, addr, flag, p)
wd->sc_openpart |= (1 << 0); /* XXX */ wd->sc_openpart |= (1 << 0); /* XXX */
wlab = wd->sc_wlabel; wlab = wd->sc_wlabel;
wd->sc_wlabel = 1; wd->sc_wlabel = 1;
error = writedisklabel(dev, wdstrategy, &wd->sc_label, error = writedisklabel(WDLABELDEV(dev), wdstrategy,
&wd->sc_cpulabel); &wd->sc_label, &wd->sc_cpulabel);
wd->sc_openpart = wd->sc_copenpart | wd->sc_bopenpart; wd->sc_openpart = wd->sc_copenpart | wd->sc_bopenpart;
wd->sc_wlabel = wlab; wd->sc_wlabel = wlab;
} }
@ -1280,7 +1285,7 @@ wdsize(dev)
if (wd->sc_state < OPEN || (wd->sc_flags & WDF_BSDLABEL) == 0) { if (wd->sc_state < OPEN || (wd->sc_flags & WDF_BSDLABEL) == 0) {
int val; int val;
val = wdopen(makewddev(major(dev), lunit, WDRAW), FREAD, val = wdopen(makewddev(major(dev), lunit, RAW_PART), FREAD,
S_IFBLK, 0); S_IFBLK, 0);
/* XXX Clear the open flag? */ /* XXX Clear the open flag? */
if (val != 0) if (val != 0)

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.85 1994/07/21 23:44:16 mycroft Exp $ * $Id: wd.c,v 1.86 1994/07/26 19:36:13 mycroft Exp $
*/ */
#define INSTRUMENT /* instrumentation stuff by Brad Parker */ #define INSTRUMENT /* instrumentation stuff by Brad Parker */
@ -82,10 +82,14 @@
#define WDIORETRIES 5 /* number of retries before giving up */ #define WDIORETRIES 5 /* number of retries before giving up */
#define WDUNIT(dev) ((minor(dev) & 0xf8) >> 3) #define WDUNIT(dev) (minor(dev) / MAXPARTITIONS)
#define WDPART(dev) ((minor(dev) & 0x07) ) #define WDPART(dev) (minor(dev) % MAXPARTITIONS)
#define makewddev(maj, unit, part) (makedev(maj, ((unit << 3) + part))) #define makewddev(maj, unit, part) \
#define WDRAW 3 /* 'd' partition isn't a partition! */ (makedev((maj), ((unit) * MAXPARTITIONS) + (part)))
#ifndef RAW_PART
#define RAW_PART 3 /* XXX should be 2 */
#endif
#define WDLABELDEV(dev) (makewddev(major(dev), WDUNIT(dev), RAW_PART))
#define b_cylin b_resid /* cylinder number for doing IO to */ #define b_cylin b_resid /* cylinder number for doing IO to */
/* shares an entry in the buf struct */ /* shares an entry in the buf struct */
@ -359,7 +363,8 @@ wdstrategy(bp)
} }
/* Have partitions and want to use them? */ /* Have partitions and want to use them? */
if ((wd->sc_flags & WDF_BSDLABEL) != 0 && WDPART(bp->b_dev) != WDRAW) { if ((wd->sc_flags & WDF_BSDLABEL) != 0 &&
WDPART(bp->b_dev) != RAW_PART) {
/* /*
* Do bounds checking, adjust transfer. if error, process. * Do bounds checking, adjust transfer. if error, process.
* If end of partition, just return. * If end of partition, just return.
@ -572,7 +577,8 @@ loop:
lp = &wd->sc_label; lp = &wd->sc_label;
secpertrk = lp->d_nsectors; secpertrk = lp->d_nsectors;
secpercyl = lp->d_secpercyl; secpercyl = lp->d_secpercyl;
if ((wd->sc_flags & WDF_BSDLABEL) != 0 && WDPART(bp->b_dev) != WDRAW) if ((wd->sc_flags & WDF_BSDLABEL) != 0 &&
WDPART(bp->b_dev) != RAW_PART)
blknum += lp->d_partitions[WDPART(bp->b_dev)].p_offset; blknum += lp->d_partitions[WDPART(bp->b_dev)].p_offset;
cylin = blknum / secpercyl; cylin = blknum / secpercyl;
head = (blknum % secpercyl) / secpertrk; head = (blknum % secpercyl) / secpertrk;
@ -843,8 +849,8 @@ wdopen(dev, flag, fmt, p)
wd->sc_state = RECAL; wd->sc_state = RECAL;
/* Read label using "raw" partition. */ /* Read label using "raw" partition. */
msg = readdisklabel(makewddev(major(dev), WDUNIT(dev), WDRAW), msg = readdisklabel(WDLABELDEV(dev), wdstrategy, &wd->sc_label,
wdstrategy, &wd->sc_label, &wd->sc_cpulabel); &wd->sc_cpulabel);
if (msg) { if (msg) {
/* /*
* This probably happened because the drive's default * This probably happened because the drive's default
@ -854,14 +860,13 @@ wdopen(dev, flag, fmt, p)
*/ */
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
msg = readdisklabel(makewddev(major(dev), WDUNIT(dev), msg = readdisklabel(WDLABELDEV(dev), wdstrategy,
WDRAW), wdstrategy, &wd->sc_label, &wd->sc_label, &wd->sc_cpulabel);
&wd->sc_cpulabel);
} }
if (msg) { if (msg) {
log(LOG_WARNING, "%s: cannot find label (%s)\n", log(LOG_WARNING, "%s: cannot find label (%s)\n",
wd->sc_dev.dv_xname, msg); wd->sc_dev.dv_xname, msg);
if (part != WDRAW) if (part != RAW_PART)
return EINVAL; /* XXX needs translation */ return EINVAL; /* XXX needs translation */
} else { } else {
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
@ -880,7 +885,7 @@ wdopen(dev, flag, fmt, p)
* Warn if a partition is opened that overlaps another partition which * Warn if a partition is opened that overlaps another partition which
* is open unless one is the "raw" partition (whole disk). * is open unless one is the "raw" partition (whole disk).
*/ */
if ((wd->sc_openpart & mask) == 0 && part != WDRAW) { if ((wd->sc_openpart & mask) == 0 && part != RAW_PART) {
int start, end; int start, end;
pp = &wd->sc_label.d_partitions[part]; pp = &wd->sc_label.d_partitions[part];
@ -892,7 +897,7 @@ wdopen(dev, flag, fmt, p)
if (pp->p_offset + pp->p_size <= start || if (pp->p_offset + pp->p_size <= start ||
pp->p_offset >= end) pp->p_offset >= end)
continue; continue;
if (pp - wd->sc_label.d_partitions == WDRAW) if (pp - wd->sc_label.d_partitions == RAW_PART)
continue; continue;
if (wd->sc_openpart & (1 << (pp - wd->sc_label.d_partitions))) if (wd->sc_openpart & (1 << (pp - wd->sc_label.d_partitions)))
log(LOG_WARNING, log(LOG_WARNING,
@ -901,7 +906,7 @@ wdopen(dev, flag, fmt, p)
pp - wd->sc_label.d_partitions + 'a'); pp - wd->sc_label.d_partitions + 'a');
} }
} }
if (part >= wd->sc_label.d_npartitions && part != WDRAW) if (part >= wd->sc_label.d_npartitions && part != RAW_PART)
return ENXIO; return ENXIO;
/* Insure only one open at a time. */ /* Insure only one open at a time. */
@ -1207,8 +1212,8 @@ wdioctl(dev, cmd, addr, flag, p)
wd->sc_openpart |= (1 << 0); /* XXX */ wd->sc_openpart |= (1 << 0); /* XXX */
wlab = wd->sc_wlabel; wlab = wd->sc_wlabel;
wd->sc_wlabel = 1; wd->sc_wlabel = 1;
error = writedisklabel(dev, wdstrategy, &wd->sc_label, error = writedisklabel(WDLABELDEV(dev), wdstrategy,
&wd->sc_cpulabel); &wd->sc_label, &wd->sc_cpulabel);
wd->sc_openpart = wd->sc_copenpart | wd->sc_bopenpart; wd->sc_openpart = wd->sc_copenpart | wd->sc_bopenpart;
wd->sc_wlabel = wlab; wd->sc_wlabel = wlab;
} }
@ -1280,7 +1285,7 @@ wdsize(dev)
if (wd->sc_state < OPEN || (wd->sc_flags & WDF_BSDLABEL) == 0) { if (wd->sc_state < OPEN || (wd->sc_flags & WDF_BSDLABEL) == 0) {
int val; int val;
val = wdopen(makewddev(major(dev), lunit, WDRAW), FREAD, val = wdopen(makewddev(major(dev), lunit, RAW_PART), FREAD,
S_IFBLK, 0); S_IFBLK, 0);
/* XXX Clear the open flag? */ /* XXX Clear the open flag? */
if (val != 0) if (val != 0)