diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-01-30 13:12:31 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-01-30 13:12:31 +0000 |
commit | 5777c5b9895805c33f1da4f72a3b5b297727888b (patch) | |
tree | dcbae5a56dbfbb22fafde3c84d0b64179e15c8b4 /sys/sys/disklabel.h | |
parent | c5cab5b2fa08c1eba3c2dc2f76b5b225b390a396 (diff) | |
download | src-5777c5b9895805c33f1da4f72a3b5b297727888b.tar.gz src-5777c5b9895805c33f1da4f72a3b5b297727888b.zip |
NO_GEOM cleanup: unifdef
Notes
Notes:
svn path=/head/; revision=110096
Diffstat (limited to 'sys/sys/disklabel.h')
-rw-r--r-- | sys/sys/disklabel.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index b0c15e138acf..1c22dfb5dfb4 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -298,10 +298,6 @@ static const char *fstypenames[] = { #define DIOCGDINFO _IOR('d', 101, struct disklabel)/* get */ #define DIOCSDINFO _IOW('d', 102, struct disklabel)/* set */ #define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */ -#ifdef NO_GEOM - -#define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ -#endif #define DIOCBSDBB _IOW('d', 110, void *) /* write bootblocks */ #ifdef _KERNEL @@ -332,28 +328,6 @@ static const char *fstypenames[] = { #define dkmakeminor(unit, slice, part) \ (((slice) << 16) | (((unit) & 0x1e0) << 16) | \ (((unit) & 0x1f) << 3) | (part)) -#ifdef NO_GEOM -#define dkpart(dev) (minor(dev) & 7) -#define dkslice(dev) ((minor(dev) >> 16) & 0x1f) -#define dksparebits(dev) ((minor(dev) >> 25) & 0x7f) - -struct bio; -struct bio_queue_head; - -int bounds_check_with_label(struct bio *bp, struct disklabel *lp, - int wlabel); -dev_t dkmodpart(dev_t dev, int part); -dev_t dkmodslice(dev_t dev, int slice); -u_int dkunit(dev_t dev); -char *readdisklabel(dev_t dev, struct disklabel *lp); -int setdisklabel(struct disklabel *olp, struct disklabel *nlp, - u_long openmask); -int writedisklabel(dev_t dev, struct disklabel *lp); -#ifdef __alpha__ -struct buf; -void alpha_fix_srm_checksum(struct buf *bp); -#endif /* NO_GEOM */ -#endif #endif /* _KERNEL */ |