diff options
| author |   deraadt <deraadt@openbsd.org> | 1997-04-06 20:59:40 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1997-04-06 20:59:40 +0000 |
| commit | 6daf152e2693a87a18866a504da1f70e0cecd712 (patch) | |
| tree | ade3d4b0dd60fd1a206924f6ce44aabe44072bc0 /sys/kern/subr_disk.c | |
| parent | Use a size_t as arg 4 to sysctl(3). (diff) | |
| download | wireguard-openbsd-6daf152e2693a87a18866a504da1f70e0cecd712.tar.xz wireguard-openbsd-6daf152e2693a87a18866a504da1f70e0cecd712.zip | |
bad dkpart(), bad dkunit(), bad bad bad
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index a7b7e2b6944..753036c5e8a 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.11 1997/02/24 14:19:57 niklas Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.12 1997/04/06 20:59:40 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -173,11 +173,6 @@ insert: bp->b_actf = bq->b_actf; bq->b_actf = bp; } -/* encoding of disk minor numbers, should be elsewhere... */ -#define dkunit(dev) (minor(dev) >> 3) -#define dkpart(dev) (minor(dev) & 07) -#define dkminor(unit, part) (((unit) << 3) | (part)) - /* * Compute checksum for disk label. */ @@ -216,7 +211,7 @@ diskerr(bp, dname, what, pri, blkdone, lp) int pri, blkdone; register struct disklabel *lp; { - int unit = dkunit(bp->b_dev), part = dkpart(bp->b_dev); + int unit = DISKUNIT(bp->b_dev), part = DISKPART(bp->b_dev); register int (*pr) __P((const char *, ...)); char partname = 'a' + part; int sn; |