diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-25 06:15:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-25 06:15:18 +0000 |
| commit | 8dcd53c9ea984dc9c7c976fa20752421339e479e (patch) | |
| tree | 2dda976092dbfa7308a353254b449f5845c8493a /sys/kern | |
| parent | a1cd832e141a9ccfc191a9898ae66e2fe5c31968 (diff) | |
introducing a 64-bit type to the disklabel structure leads some architectures
to pad-align the size of the structure; it grows, the disklabel ioctl's are
break ABI. Change the uid to a character array. this also simplifies some
other stuff
ok jsing
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 53638585e6c..0d462c86ec5 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.100 2010/04/23 15:25:21 jsing Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.101 2010/04/25 06:15:17 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -278,7 +278,7 @@ checkdisklabel(void *rlp, struct disklabel *lp, dlp->d_secpercyl = swap32(dlp->d_secpercyl); dlp->d_secperunit = swap32(dlp->d_secperunit); - dlp->d_label_uid = swap64(dlp->d_label_uid); + /* d_uid is a string */ dlp->d_acylinders = swap32(dlp->d_acylinders); |