summaryrefslogtreecommitdiffstats
path: root/src/ufs.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/ufs.h')
-rw-r--r--src/ufs.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ufs.h b/src/ufs.h
index 284b820..bbdf391 100644
--- a/src/ufs.h
+++ b/src/ufs.h
@@ -283,17 +283,19 @@ extern "C" {
#define UFS_DIR_ROUND (UFS_DIR_PAD - 1)
#define UFS_DIR_REC_LEN(name_len) (((name_len) + 1 + 8 + UFS_DIR_ROUND) & ~UFS_DIR_ROUND)
+
struct ufs_timeval {
uint32_t tv_sec;
uint32_t tv_usec;
-} __attribute__ ((__packed__));
+} __attribute__ ((gcc_struct, __packed__));
struct ufs_csum {
uint32_t cs_ndir; /* number of directories */
uint32_t cs_nbfree; /* number of free blocks */
uint32_t cs_nifree; /* number of free inodes */
uint32_t cs_nffree; /* number of free frags */
-} __attribute__ ((__packed__));
+} __attribute__ ((gcc_struct, __packed__));
+
struct ufs2_csum_total {
uint64_t cs_ndir; /* number of directories */
uint64_t cs_nbfree; /* number of free blocks */
@@ -301,7 +303,7 @@ struct ufs2_csum_total {
uint64_t cs_nffree; /* number of free frags */
uint64_t cs_numclusters; /* number of free clusters */
uint64_t cs_spare[3]; /* future expansion */
-} __attribute__ ((__packed__));
+} __attribute__ ((gcc_struct, __packed__));
struct fs_u11_u1_st {
int8_t fs_fsmnt[UFS_MAXMNTLEN];/* name mounted on */
@@ -310,7 +312,7 @@ struct fs_u11_u1_st {
uint32_t fs_maxcluster;
uint32_t fs_cpc; /* cyl per cycle in postbl */
uint16_t fs_opostbl[16][8]; /* old rotation block list head */
-} __attribute__ ((__packed__));
+} __attribute__ ((gcc_struct, __packed__));
struct fs_u11_u2_st {
int8_t fs_fsmnt[UFS2_MAXMNTLEN]; /* name mounted on */
@@ -334,7 +336,7 @@ struct fs_u11_u2_st {
uint64_t fs_csaddr; /* blk addr of cyl grp summary area */
uint64_t fs_pendingblocks;/* blocks in process of being freed */
uint32_t fs_pendinginodes;/*inodes in process of being freed */
-} __attribute__ ((__packed__));
+} __attribute__ ((gcc_struct, __packed__));
/*
* This is the actual superblock, as it is laid out on the disk.
@@ -453,7 +455,7 @@ struct ufs_super_block {
uint32_t fs_rotbloff; /* (uint8_t) blocks for each rotation */
uint32_t fs_magic; /* magic number */
uint8_t fs_space[1]; /* list of blocks for each rotation */
-} __attribute__ ((__packed__));
+} __attribute__ ((gcc_struct, __packed__));
/*
* Preference for optimization.