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/arch/sparc64 | |
| 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/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/sparc64/disksubr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c index 42cd8339f2d..c59db8c5d12 100644 --- a/sys/arch/sparc64/sparc64/disksubr.c +++ b/sys/arch/sparc64/sparc64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.60 2010/04/24 20:12:23 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.61 2010/04/25 06:15:17 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */ /* @@ -260,7 +260,7 @@ disklabel_sun_to_bsd(struct sun_disklabel *sl, struct disklabel *lp) DL_SETDSIZE(lp, (daddr64_t)secpercyl * sl->sl_ncylinders); lp->d_version = 1; - lp->d_label_uid = sl->sl_label_uid; + memcpy(&lp->d_uid, &sl->sl_uid, sizeof(lp->d_uid)); lp->d_acylinders = sl->sl_acylinders; @@ -406,7 +406,7 @@ disklabel_bsd_to_sun(struct disklabel *lp, struct sun_disklabel *sl) sl->sl_ntracks = lp->d_ntracks; sl->sl_nsectors = lp->d_nsectors; - sl->sl_label_uid = lp->d_label_uid; + memcpy(&sl->sl_uid, &lp->d_uid, sizeof(lp->d_uid)); secpercyl = sl->sl_nsectors * sl->sl_ntracks; for (i = 0; i < 8; i++) { |