diff options
| author | phk <phk@FreeBSD.org> | 2001-11-04 09:01:07 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2001-11-04 09:01:07 +0000 |
| commit | c665837dfda33ce92ed020e9201d3145438ea776 (patch) | |
| tree | 569ca860650009a397319a794d3de7395c373038 /sys | |
| parent | a5f9edc45abbd6f38474751dd2d30eb9d751f116 (diff) | |
| download | FreeBSD-src-c665837dfda33ce92ed020e9201d3145438ea776.zip FreeBSD-src-c665837dfda33ce92ed020e9201d3145438ea776.tar.gz | |
Rename the top 7 bits if disk minors to spare bits, rather than type bits.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/subr_disk.c | 2 | ||||
| -rw-r--r-- | sys/pc98/pc98/wd.c | 2 | ||||
| -rw-r--r-- | sys/sys/disklabel.h | 4 | ||||
| -rw-r--r-- | sys/sys/diskmbr.h | 4 | ||||
| -rw-r--r-- | sys/sys/diskpc98.h | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index af1ab84..3a551e8 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -41,7 +41,7 @@ disk_dev_synth(dev_t dev) int u, s, p; dev_t pdev; - if (dktype(dev)) + if (dksparebits(dev)) return; LIST_FOREACH(dp, &disklist, d_list) { if (major(dev) != dp->d_devsw->d_maj) diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 3916b01..1ed9f1b 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -1232,7 +1232,7 @@ wdopen(dev_t dev, int flags, int fmt, struct thread *td) struct disklabel *dl; lunit = dkunit(dev); - if (lunit >= NWD || dktype(dev) != 0) + if (lunit >= NWD || dksparebits(dev) != 0) return (ENXIO); du = wddrives[lunit]; if (du == NULL) diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 7d51a84..244e837 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -428,7 +428,7 @@ struct dos_partition { _________________________________________________________________ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ----------------------------------------------------------------- - | TYPE |UNIT_2 | SLICE | MAJOR? | UNIT |PART | + | SPARE |UNIT_2 | SLICE | MAJOR? | UNIT |PART | ----------------------------------------------------------------- */ @@ -451,7 +451,7 @@ dkmodslice(dev_t dev, int slice) #define dkpart(dev) (minor(dev) & 7) #define dkslice(dev) ((minor(dev) >> 16) & 0x1f) -#define dktype(dev) ((minor(dev) >> 25) & 0x7f) +#define dksparebits(dev) ((minor(dev) >> 25) & 0x7f) static __inline u_int dkunit(dev_t dev) diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h index 7d51a84..244e837 100644 --- a/sys/sys/diskmbr.h +++ b/sys/sys/diskmbr.h @@ -428,7 +428,7 @@ struct dos_partition { _________________________________________________________________ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ----------------------------------------------------------------- - | TYPE |UNIT_2 | SLICE | MAJOR? | UNIT |PART | + | SPARE |UNIT_2 | SLICE | MAJOR? | UNIT |PART | ----------------------------------------------------------------- */ @@ -451,7 +451,7 @@ dkmodslice(dev_t dev, int slice) #define dkpart(dev) (minor(dev) & 7) #define dkslice(dev) ((minor(dev) >> 16) & 0x1f) -#define dktype(dev) ((minor(dev) >> 25) & 0x7f) +#define dksparebits(dev) ((minor(dev) >> 25) & 0x7f) static __inline u_int dkunit(dev_t dev) diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h index 7d51a84..244e837 100644 --- a/sys/sys/diskpc98.h +++ b/sys/sys/diskpc98.h @@ -428,7 +428,7 @@ struct dos_partition { _________________________________________________________________ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ----------------------------------------------------------------- - | TYPE |UNIT_2 | SLICE | MAJOR? | UNIT |PART | + | SPARE |UNIT_2 | SLICE | MAJOR? | UNIT |PART | ----------------------------------------------------------------- */ @@ -451,7 +451,7 @@ dkmodslice(dev_t dev, int slice) #define dkpart(dev) (minor(dev) & 7) #define dkslice(dev) ((minor(dev) >> 16) & 0x1f) -#define dktype(dev) ((minor(dev) >> 25) & 0x7f) +#define dksparebits(dev) ((minor(dev) >> 25) & 0x7f) static __inline u_int dkunit(dev_t dev) |
