diff options
| author |   krw <krw@openbsd.org> | 2007-06-02 02:35:26 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2007-06-02 02:35:26 +0000 |
| commit | 352e6bd600b5b7e43e32eec0e4d43a904bff5639 (patch) | |
| tree | 2c626dcb8cddf12ff07aa3bffd5071662d6282d9 /sys/kern/subr_disk.c | |
| parent | convert all daddr_t types to either daddr64_t or uint32_t or other such (diff) | |
| download | wireguard-openbsd-352e6bd600b5b7e43e32eec0e4d43a904bff5639.tar.xz wireguard-openbsd-352e6bd600b5b7e43e32eec0e4d43a904bff5639.zip | |
Rename cvtdisklabelv1 -> disklabeltokernlabel. It does more than just
convert version 0 to version 1 disklabels.
Suggested by deraadt@.
ok deraadt@ otto@
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index d96842f664e..1b0a2c82e14 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.44 2007/06/01 19:06:28 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.45 2007/06/02 02:35:27 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -182,10 +182,12 @@ dkcksum(struct disklabel *lp) } /* - * Convert an old disklabel to a v1 disklabel + * Convert an on-disk disklabel to a kernel disklabel, converting versions + * as required and applying constraints that kernel disklabels are guaranteed + * to satisfy. */ void -cvtdisklabelv1(struct disklabel *lp) +disklabeltokernlabel(struct disklabel *lp) { struct __partitionv0 *v0pp = (struct __partitionv0 *)lp->d_partitions; struct partition *pp = lp->d_partitions; |