Commit 75f27138 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jan Kara

udf: use __packed instead of __attribute__ ((packed))

defined in linux/compiler-gcc.h
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent ad4d0532
This diff is collapsed.
...@@ -70,17 +70,17 @@ struct UDFIdentSuffix { ...@@ -70,17 +70,17 @@ struct UDFIdentSuffix {
uint8_t OSClass; uint8_t OSClass;
uint8_t OSIdentifier; uint8_t OSIdentifier;
uint8_t reserved[4]; uint8_t reserved[4];
} __attribute__ ((packed)); } __packed;
struct impIdentSuffix { struct impIdentSuffix {
uint8_t OSClass; uint8_t OSClass;
uint8_t OSIdentifier; uint8_t OSIdentifier;
uint8_t reserved[6]; uint8_t reserved[6];
} __attribute__ ((packed)); } __packed;
struct appIdentSuffix { struct appIdentSuffix {
uint8_t impUse[8]; uint8_t impUse[8];
} __attribute__ ((packed)); } __packed;
/* Logical Volume Integrity Descriptor (UDF 2.50 2.2.6) */ /* Logical Volume Integrity Descriptor (UDF 2.50 2.2.6) */
/* Implementation Use (UDF 2.50 2.2.6.4) */ /* Implementation Use (UDF 2.50 2.2.6.4) */
...@@ -92,7 +92,7 @@ struct logicalVolIntegrityDescImpUse { ...@@ -92,7 +92,7 @@ struct logicalVolIntegrityDescImpUse {
__le16 minUDFWriteRev; __le16 minUDFWriteRev;
__le16 maxUDFWriteRev; __le16 maxUDFWriteRev;
uint8_t impUse[0]; uint8_t impUse[0];
} __attribute__ ((packed)); } __packed;
/* Implementation Use Volume Descriptor (UDF 2.50 2.2.7) */ /* Implementation Use Volume Descriptor (UDF 2.50 2.2.7) */
/* Implementation Use (UDF 2.50 2.2.7.2) */ /* Implementation Use (UDF 2.50 2.2.7.2) */
...@@ -104,7 +104,7 @@ struct impUseVolDescImpUse { ...@@ -104,7 +104,7 @@ struct impUseVolDescImpUse {
dstring LVInfo3[36]; dstring LVInfo3[36];
struct regid impIdent; struct regid impIdent;
uint8_t impUse[128]; uint8_t impUse[128];
} __attribute__ ((packed)); } __packed;
struct udfPartitionMap2 { struct udfPartitionMap2 {
uint8_t partitionMapType; uint8_t partitionMapType;
...@@ -113,7 +113,7 @@ struct udfPartitionMap2 { ...@@ -113,7 +113,7 @@ struct udfPartitionMap2 {
struct regid partIdent; struct regid partIdent;
__le16 volSeqNum; __le16 volSeqNum;
__le16 partitionNum; __le16 partitionNum;
} __attribute__ ((packed)); } __packed;
/* Virtual Partition Map (UDF 2.50 2.2.8) */ /* Virtual Partition Map (UDF 2.50 2.2.8) */
struct virtualPartitionMap { struct virtualPartitionMap {
...@@ -124,7 +124,7 @@ struct virtualPartitionMap { ...@@ -124,7 +124,7 @@ struct virtualPartitionMap {
__le16 volSeqNum; __le16 volSeqNum;
__le16 partitionNum; __le16 partitionNum;
uint8_t reserved2[24]; uint8_t reserved2[24];
} __attribute__ ((packed)); } __packed;
/* Sparable Partition Map (UDF 2.50 2.2.9) */ /* Sparable Partition Map (UDF 2.50 2.2.9) */
struct sparablePartitionMap { struct sparablePartitionMap {
...@@ -139,7 +139,7 @@ struct sparablePartitionMap { ...@@ -139,7 +139,7 @@ struct sparablePartitionMap {
uint8_t reserved2[1]; uint8_t reserved2[1];
__le32 sizeSparingTable; __le32 sizeSparingTable;
__le32 locSparingTable[4]; __le32 locSparingTable[4];
} __attribute__ ((packed)); } __packed;
/* Metadata Partition Map (UDF 2.4.0 2.2.10) */ /* Metadata Partition Map (UDF 2.4.0 2.2.10) */
struct metadataPartitionMap { struct metadataPartitionMap {
...@@ -156,14 +156,14 @@ struct metadataPartitionMap { ...@@ -156,14 +156,14 @@ struct metadataPartitionMap {
__le16 alignUnitSize; __le16 alignUnitSize;
uint8_t flags; uint8_t flags;
uint8_t reserved2[5]; uint8_t reserved2[5];
} __attribute__ ((packed)); } __packed;
/* Virtual Allocation Table (UDF 1.5 2.2.10) */ /* Virtual Allocation Table (UDF 1.5 2.2.10) */
struct virtualAllocationTable15 { struct virtualAllocationTable15 {
__le32 VirtualSector[0]; __le32 VirtualSector[0];
struct regid vatIdent; struct regid vatIdent;
__le32 previousVATICBLoc; __le32 previousVATICBLoc;
} __attribute__ ((packed)); } __packed;
#define ICBTAG_FILE_TYPE_VAT15 0x00U #define ICBTAG_FILE_TYPE_VAT15 0x00U
...@@ -181,7 +181,7 @@ struct virtualAllocationTable20 { ...@@ -181,7 +181,7 @@ struct virtualAllocationTable20 {
__le16 reserved; __le16 reserved;
uint8_t impUse[0]; uint8_t impUse[0];
__le32 vatEntry[0]; __le32 vatEntry[0];
} __attribute__ ((packed)); } __packed;
#define ICBTAG_FILE_TYPE_VAT20 0xF8U #define ICBTAG_FILE_TYPE_VAT20 0xF8U
...@@ -189,7 +189,7 @@ struct virtualAllocationTable20 { ...@@ -189,7 +189,7 @@ struct virtualAllocationTable20 {
struct sparingEntry { struct sparingEntry {
__le32 origLocation; __le32 origLocation;
__le32 mappedLocation; __le32 mappedLocation;
} __attribute__ ((packed)); } __packed;
struct sparingTable { struct sparingTable {
struct tag descTag; struct tag descTag;
...@@ -199,7 +199,7 @@ struct sparingTable { ...@@ -199,7 +199,7 @@ struct sparingTable {
__le32 sequenceNum; __le32 sequenceNum;
struct sparingEntry struct sparingEntry
mapEntry[0]; mapEntry[0];
} __attribute__ ((packed)); } __packed;
/* Metadata File (and Metadata Mirror File) (UDF 2.50 2.2.13.1) */ /* Metadata File (and Metadata Mirror File) (UDF 2.50 2.2.13.1) */
#define ICBTAG_FILE_TYPE_MAIN 0xFA #define ICBTAG_FILE_TYPE_MAIN 0xFA
...@@ -210,7 +210,7 @@ struct sparingTable { ...@@ -210,7 +210,7 @@ struct sparingTable {
struct allocDescImpUse { struct allocDescImpUse {
__le16 flags; __le16 flags;
uint8_t impUse[4]; uint8_t impUse[4];
} __attribute__ ((packed)); } __packed;
#define AD_IU_EXT_ERASED 0x0001 #define AD_IU_EXT_ERASED 0x0001
...@@ -222,7 +222,7 @@ struct allocDescImpUse { ...@@ -222,7 +222,7 @@ struct allocDescImpUse {
struct freeEaSpace { struct freeEaSpace {
__le16 headerChecksum; __le16 headerChecksum;
uint8_t freeEASpace[0]; uint8_t freeEASpace[0];
} __attribute__ ((packed)); } __packed;
/* DVD Copyright Management Information (UDF 2.50 3.3.4.5.1.2) */ /* DVD Copyright Management Information (UDF 2.50 3.3.4.5.1.2) */
struct DVDCopyrightImpUse { struct DVDCopyrightImpUse {
...@@ -230,14 +230,14 @@ struct DVDCopyrightImpUse { ...@@ -230,14 +230,14 @@ struct DVDCopyrightImpUse {
uint8_t CGMSInfo; uint8_t CGMSInfo;
uint8_t dataType; uint8_t dataType;
uint8_t protectionSystemInfo[4]; uint8_t protectionSystemInfo[4];
} __attribute__ ((packed)); } __packed;
/* Application Use Extended Attribute (UDF 2.50 3.3.4.6) */ /* Application Use Extended Attribute (UDF 2.50 3.3.4.6) */
/* FreeAppEASpace (UDF 2.50 3.3.4.6.1) */ /* FreeAppEASpace (UDF 2.50 3.3.4.6.1) */
struct freeAppEASpace { struct freeAppEASpace {
__le16 headerChecksum; __le16 headerChecksum;
uint8_t freeEASpace[0]; uint8_t freeEASpace[0];
} __attribute__ ((packed)); } __packed;
/* UDF Defined System Stream (UDF 2.50 3.3.7) */ /* UDF Defined System Stream (UDF 2.50 3.3.7) */
#define UDF_ID_UNIQUE_ID "*UDF Unique ID Mapping Data" #define UDF_ID_UNIQUE_ID "*UDF Unique ID Mapping Data"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment