diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-06-04 14:49:25 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-06-26 20:14:13 -0400 |
| commit | 3ae762a09cd72a08ef620c80fbb263693c3fb204 (patch) | |
| tree | d75f9f8cfa2bec4ced31f593d5ccbab8c8cc94ac /include/uapi/linux/adfs_fs.h | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
fs/adfs: correct disc record structure
Fill in some padding in the disc record structure, and add GCC
packed and aligned attributes to ensure that it is correctly
laid out.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/uapi/linux/adfs_fs.h')
| -rw-r--r-- | include/uapi/linux/adfs_fs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/adfs_fs.h b/include/uapi/linux/adfs_fs.h index 151d93e27ed4..f1a7d67a7323 100644 --- a/include/uapi/linux/adfs_fs.h +++ b/include/uapi/linux/adfs_fs.h @@ -29,17 +29,17 @@ struct adfs_discrecord { __u8 log2sharesize:4; __u8 unused40:4; __u8 big_flag:1; - __u8 unused41:1; + __u8 unused41:7; __u8 nzones_high; + __u8 reserved43; __le32 format_version; __le32 root_size; __u8 unused52[60 - 52]; -}; +} __attribute__((packed, aligned(4))); #define ADFS_DISCRECORD (0xc00) #define ADFS_DR_OFFSET (0x1c0) #define ADFS_DR_SIZE 60 #define ADFS_DR_SIZE_BITS (ADFS_DR_SIZE << 3) - #endif /* _UAPI_ADFS_FS_H */ |