aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2000-09-19 10:25:01 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2000-09-19 10:25:01 +0000
commit19cf3044c15072016e1132a98369d38b7e6d93d8 (patch)
treea0fe64453ee0ede50094ac25f6ffdf91265bf169
parent9b24396beb930eca655e16eac24b6ddad4524136 (diff)
Notes
-rw-r--r--sys/sys/disklabel.h7
-rw-r--r--sys/sys/diskmbr.h7
-rw-r--r--sys/sys/diskpc98.h7
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 040cc33f20517..ea3e41e7b767c 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -172,12 +172,7 @@ struct disklabel {
u_int32_t p_fsize; /* filesystem basic fragment size */
u_int8_t p_fstype; /* filesystem type, see below */
u_int8_t p_frag; /* filesystem fragments per 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; /* filesystem cylinders per group */
} d_partitions[MAXPARTITIONS]; /* actually may be more */
};
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 040cc33f20517..ea3e41e7b767c 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -172,12 +172,7 @@ struct disklabel {
u_int32_t p_fsize; /* filesystem basic fragment size */
u_int8_t p_fstype; /* filesystem type, see below */
u_int8_t p_frag; /* filesystem fragments per 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; /* filesystem cylinders per group */
} d_partitions[MAXPARTITIONS]; /* actually may be more */
};
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 040cc33f20517..ea3e41e7b767c 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -172,12 +172,7 @@ struct disklabel {
u_int32_t p_fsize; /* filesystem basic fragment size */
u_int8_t p_fstype; /* filesystem type, see below */
u_int8_t p_frag; /* filesystem fragments per 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; /* filesystem cylinders per group */
} d_partitions[MAXPARTITIONS]; /* actually may be more */
};