diff options
| author |   thib <thib@openbsd.org> | 2007-05-29 16:26:53 +0000 |
|---|---|---|
| committer | thib <thib@openbsd.org> | 2007-05-29 16:26:53 +0000 |
| commit | 242e33aa9068aad36d3edee6a690001bb23783fa (patch) | |
| tree | 12e97d837898cad69999b085dfab386265c39aa3 | |
| parent | Nuke the predefined vattr, it was only used for !DIAGNOSTIC, (diff) | |
| download | wireguard-openbsd-242e33aa9068aad36d3edee6a690001bb23783fa.tar.xz wireguard-openbsd-242e33aa9068aad36d3edee6a690001bb23783fa.zip | |
Collapse the __partition_u1 union in struct disklabel,
keep p_cpg around since its need. remove p_sgs.
ok otto@,krw@
| -rw-r--r-- | sys/sys/disklabel.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index f7a3e7fbf83..492ed4f1e2d 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.29 2007/05/29 06:28:14 otto Exp $ */ +/* $OpenBSD: disklabel.h,v 1.30 2007/05/29 16:26:53 thib Exp $ */ /* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */ /* @@ -163,12 +163,7 @@ struct disklabel { u_int16_t p_sizeh; /* number of sectors (high part) */ u_int8_t p_fstype; /* filesystem type, see below */ u_int8_t p_fragblock; /* encoded filesystem frag/block */ - union { - u_int16_t cpg; /* UFS: FS cylinders per group */ - u_int16_t sgs; /* LFS: FS segment shift */ - } __partition_u1; -#define p_cpg __partition_u1.cpg -#define p_sgs __partition_u1.sgs + u_int16_t p_cpg; /* UFS: FS cylinders per group */ } d_partitions[MAXPARTITIONS]; /* actually may be more */ }; |