Re: [PATCH 01/12 linux-next] udf: use __packed instead of __attribute__ ((packed))
On Fri 06-01-17 21:53:49, Fabian Frederick wrote: > defined in linux/compiler-gcc.h > > Signed-off-by: Fabian FrederickThanks. Applied. Honza > --- > fs/udf/ecma_167.h | 98 > +++ > fs/udf/osta_udf.h | 34 +-- > 2 files changed, 66 insertions(+), 66 deletions(-) > > diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h > index 4792b77..9f24bd1 100644 > --- a/fs/udf/ecma_167.h > +++ b/fs/udf/ecma_167.h > @@ -41,7 +41,7 @@ > struct charspec { > uint8_t charSetType; > uint8_t charSetInfo[63]; > -} __attribute__ ((packed)); > +} __packed; > > /* Character Set Type (ECMA 167r3 1/7.2.1.1) */ > #define CHARSPEC_TYPE_CS00x00/* (1/7.2.2) */ > @@ -68,7 +68,7 @@ struct timestamp { > uint8_t centiseconds; > uint8_t hundredsOfMicroseconds; > uint8_t microseconds; > -} __attribute__ ((packed)); > +} __packed; > > /* Type and Time Zone (ECMA 167r3 1/7.3.1) */ > #define TIMESTAMP_TYPE_MASK 0xF000 > @@ -82,7 +82,7 @@ struct regid { > uint8_t flags; > uint8_t ident[23]; > uint8_t identSuffix[8]; > -} __attribute__ ((packed)); > +} __packed; > > /* Flags (ECMA 167r3 1/7.4.1) */ > #define ENTITYID_FLAGS_DIRTY 0x00 > @@ -95,7 +95,7 @@ struct volStructDesc { > uint8_t stdIdent[VSD_STD_ID_LEN]; > uint8_t structVersion; > uint8_t structData[2041]; > -} __attribute__ ((packed)); > +} __packed; > > /* Standard Identifier (EMCA 167r2 2/9.1.2) */ > #define VSD_STD_ID_NSR02 "NSR02" /* (3/9.1) */ > @@ -114,7 +114,7 @@ struct beginningExtendedAreaDesc { > uint8_t stdIdent[VSD_STD_ID_LEN]; > uint8_t structVersion; > uint8_t structData[2041]; > -} __attribute__ ((packed)); > +} __packed; > > /* Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */ > struct terminatingExtendedAreaDesc { > @@ -122,7 +122,7 @@ struct terminatingExtendedAreaDesc { > uint8_t stdIdent[VSD_STD_ID_LEN]; > uint8_t structVersion; > uint8_t structData[2041]; > -} __attribute__ ((packed)); > +} __packed; > > /* Boot Descriptor (ECMA 167r3 2/9.4) */ > struct bootDesc { > @@ -140,7 +140,7 @@ struct bootDesc { > __le16 flags; > uint8_t reserved2[32]; > uint8_t bootUse[1906]; > -} __attribute__ ((packed)); > +} __packed; > > /* Flags (ECMA 167r3 2/9.4.12) */ > #define BOOT_FLAGS_ERASE 0x01 > @@ -149,7 +149,7 @@ struct bootDesc { > struct extent_ad { > __le32 extLength; > __le32 extLocation; > -} __attribute__ ((packed)); > +} __packed; > > struct kernel_extent_ad { > uint32_textLength; > @@ -166,7 +166,7 @@ struct tag { > __le16 descCRC; > __le16 descCRCLength; > __le32 tagLocation; > -} __attribute__ ((packed)); > +} __packed; > > /* Tag Identifier (ECMA 167r3 3/7.2.1) */ > #define TAG_IDENT_PVD0x0001 > @@ -186,7 +186,7 @@ struct NSRDesc { > uint8_t structVersion; > uint8_t reserved; > uint8_t structData[2040]; > -} __attribute__ ((packed)); > +} __packed; > > /* Primary Volume Descriptor (ECMA 167r3 3/10.1) */ > struct primaryVolDesc { > @@ -212,7 +212,7 @@ struct primaryVolDesc { > __le32 predecessorVolDescSeqLocation; > __le16 flags; > uint8_t reserved[22]; > -} __attribute__ ((packed)); > +} __packed; > > /* Flags (ECMA 167r3 3/10.1.21) */ > #define PVD_FLAGS_VSID_COMMON0x0001 > @@ -223,7 +223,7 @@ struct anchorVolDescPtr { > struct extent_admainVolDescSeqExt; > struct extent_adreserveVolDescSeqExt; > uint8_t reserved[480]; > -} __attribute__ ((packed)); > +} __packed; > > /* Volume Descriptor Pointer (ECMA 167r3 3/10.3) */ > struct volDescPtr { > @@ -231,7 +231,7 @@ struct volDescPtr { > __le32 volDescSeqNum; > struct extent_adnextVolDescSeqExt; > uint8_t reserved[484]; > -} __attribute__ ((packed)); > +} __packed; > > /* Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */ > struct impUseVolDesc { > @@ -239,7 +239,7 @@ struct impUseVolDesc { > __le32 volDescSeqNum; > struct regidimpIdent; > uint8_t impUse[460]; > -} __attribute__ ((packed)); > +} __packed; > > /* Partition Descriptor (ECMA 167r3 3/10.5) */ > struct partitionDesc { > @@ -255,7 +255,7 @@ struct partitionDesc { > struct regid impIdent; > uint8_t impUse[128]; > uint8_t reserved[156]; > -} __attribute__ ((packed)); > +} __packed; >
Re: [PATCH 01/12 linux-next] udf: use __packed instead of __attribute__ ((packed))
On Fri 06-01-17 21:53:49, Fabian Frederick wrote: > defined in linux/compiler-gcc.h > > Signed-off-by: Fabian Frederick Thanks. Applied. Honza > --- > fs/udf/ecma_167.h | 98 > +++ > fs/udf/osta_udf.h | 34 +-- > 2 files changed, 66 insertions(+), 66 deletions(-) > > diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h > index 4792b77..9f24bd1 100644 > --- a/fs/udf/ecma_167.h > +++ b/fs/udf/ecma_167.h > @@ -41,7 +41,7 @@ > struct charspec { > uint8_t charSetType; > uint8_t charSetInfo[63]; > -} __attribute__ ((packed)); > +} __packed; > > /* Character Set Type (ECMA 167r3 1/7.2.1.1) */ > #define CHARSPEC_TYPE_CS00x00/* (1/7.2.2) */ > @@ -68,7 +68,7 @@ struct timestamp { > uint8_t centiseconds; > uint8_t hundredsOfMicroseconds; > uint8_t microseconds; > -} __attribute__ ((packed)); > +} __packed; > > /* Type and Time Zone (ECMA 167r3 1/7.3.1) */ > #define TIMESTAMP_TYPE_MASK 0xF000 > @@ -82,7 +82,7 @@ struct regid { > uint8_t flags; > uint8_t ident[23]; > uint8_t identSuffix[8]; > -} __attribute__ ((packed)); > +} __packed; > > /* Flags (ECMA 167r3 1/7.4.1) */ > #define ENTITYID_FLAGS_DIRTY 0x00 > @@ -95,7 +95,7 @@ struct volStructDesc { > uint8_t stdIdent[VSD_STD_ID_LEN]; > uint8_t structVersion; > uint8_t structData[2041]; > -} __attribute__ ((packed)); > +} __packed; > > /* Standard Identifier (EMCA 167r2 2/9.1.2) */ > #define VSD_STD_ID_NSR02 "NSR02" /* (3/9.1) */ > @@ -114,7 +114,7 @@ struct beginningExtendedAreaDesc { > uint8_t stdIdent[VSD_STD_ID_LEN]; > uint8_t structVersion; > uint8_t structData[2041]; > -} __attribute__ ((packed)); > +} __packed; > > /* Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */ > struct terminatingExtendedAreaDesc { > @@ -122,7 +122,7 @@ struct terminatingExtendedAreaDesc { > uint8_t stdIdent[VSD_STD_ID_LEN]; > uint8_t structVersion; > uint8_t structData[2041]; > -} __attribute__ ((packed)); > +} __packed; > > /* Boot Descriptor (ECMA 167r3 2/9.4) */ > struct bootDesc { > @@ -140,7 +140,7 @@ struct bootDesc { > __le16 flags; > uint8_t reserved2[32]; > uint8_t bootUse[1906]; > -} __attribute__ ((packed)); > +} __packed; > > /* Flags (ECMA 167r3 2/9.4.12) */ > #define BOOT_FLAGS_ERASE 0x01 > @@ -149,7 +149,7 @@ struct bootDesc { > struct extent_ad { > __le32 extLength; > __le32 extLocation; > -} __attribute__ ((packed)); > +} __packed; > > struct kernel_extent_ad { > uint32_textLength; > @@ -166,7 +166,7 @@ struct tag { > __le16 descCRC; > __le16 descCRCLength; > __le32 tagLocation; > -} __attribute__ ((packed)); > +} __packed; > > /* Tag Identifier (ECMA 167r3 3/7.2.1) */ > #define TAG_IDENT_PVD0x0001 > @@ -186,7 +186,7 @@ struct NSRDesc { > uint8_t structVersion; > uint8_t reserved; > uint8_t structData[2040]; > -} __attribute__ ((packed)); > +} __packed; > > /* Primary Volume Descriptor (ECMA 167r3 3/10.1) */ > struct primaryVolDesc { > @@ -212,7 +212,7 @@ struct primaryVolDesc { > __le32 predecessorVolDescSeqLocation; > __le16 flags; > uint8_t reserved[22]; > -} __attribute__ ((packed)); > +} __packed; > > /* Flags (ECMA 167r3 3/10.1.21) */ > #define PVD_FLAGS_VSID_COMMON0x0001 > @@ -223,7 +223,7 @@ struct anchorVolDescPtr { > struct extent_admainVolDescSeqExt; > struct extent_adreserveVolDescSeqExt; > uint8_t reserved[480]; > -} __attribute__ ((packed)); > +} __packed; > > /* Volume Descriptor Pointer (ECMA 167r3 3/10.3) */ > struct volDescPtr { > @@ -231,7 +231,7 @@ struct volDescPtr { > __le32 volDescSeqNum; > struct extent_adnextVolDescSeqExt; > uint8_t reserved[484]; > -} __attribute__ ((packed)); > +} __packed; > > /* Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */ > struct impUseVolDesc { > @@ -239,7 +239,7 @@ struct impUseVolDesc { > __le32 volDescSeqNum; > struct regidimpIdent; > uint8_t impUse[460]; > -} __attribute__ ((packed)); > +} __packed; > > /* Partition Descriptor (ECMA 167r3 3/10.5) */ > struct partitionDesc { > @@ -255,7 +255,7 @@ struct partitionDesc { > struct regid impIdent; > uint8_t impUse[128]; > uint8_t reserved[156]; > -} __attribute__ ((packed)); > +} __packed; > > /*
[PATCH 01/12 linux-next] udf: use __packed instead of __attribute__ ((packed))
defined in linux/compiler-gcc.h Signed-off-by: Fabian Frederick--- fs/udf/ecma_167.h | 98 +++ fs/udf/osta_udf.h | 34 +-- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h index 4792b77..9f24bd1 100644 --- a/fs/udf/ecma_167.h +++ b/fs/udf/ecma_167.h @@ -41,7 +41,7 @@ struct charspec { uint8_t charSetType; uint8_t charSetInfo[63]; -} __attribute__ ((packed)); +} __packed; /* Character Set Type (ECMA 167r3 1/7.2.1.1) */ #define CHARSPEC_TYPE_CS0 0x00/* (1/7.2.2) */ @@ -68,7 +68,7 @@ struct timestamp { uint8_t centiseconds; uint8_t hundredsOfMicroseconds; uint8_t microseconds; -} __attribute__ ((packed)); +} __packed; /* Type and Time Zone (ECMA 167r3 1/7.3.1) */ #define TIMESTAMP_TYPE_MASK0xF000 @@ -82,7 +82,7 @@ struct regid { uint8_t flags; uint8_t ident[23]; uint8_t identSuffix[8]; -} __attribute__ ((packed)); +} __packed; /* Flags (ECMA 167r3 1/7.4.1) */ #define ENTITYID_FLAGS_DIRTY 0x00 @@ -95,7 +95,7 @@ struct volStructDesc { uint8_t stdIdent[VSD_STD_ID_LEN]; uint8_t structVersion; uint8_t structData[2041]; -} __attribute__ ((packed)); +} __packed; /* Standard Identifier (EMCA 167r2 2/9.1.2) */ #define VSD_STD_ID_NSR02 "NSR02" /* (3/9.1) */ @@ -114,7 +114,7 @@ struct beginningExtendedAreaDesc { uint8_t stdIdent[VSD_STD_ID_LEN]; uint8_t structVersion; uint8_t structData[2041]; -} __attribute__ ((packed)); +} __packed; /* Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */ struct terminatingExtendedAreaDesc { @@ -122,7 +122,7 @@ struct terminatingExtendedAreaDesc { uint8_t stdIdent[VSD_STD_ID_LEN]; uint8_t structVersion; uint8_t structData[2041]; -} __attribute__ ((packed)); +} __packed; /* Boot Descriptor (ECMA 167r3 2/9.4) */ struct bootDesc { @@ -140,7 +140,7 @@ struct bootDesc { __le16 flags; uint8_t reserved2[32]; uint8_t bootUse[1906]; -} __attribute__ ((packed)); +} __packed; /* Flags (ECMA 167r3 2/9.4.12) */ #define BOOT_FLAGS_ERASE 0x01 @@ -149,7 +149,7 @@ struct bootDesc { struct extent_ad { __le32 extLength; __le32 extLocation; -} __attribute__ ((packed)); +} __packed; struct kernel_extent_ad { uint32_textLength; @@ -166,7 +166,7 @@ struct tag { __le16 descCRC; __le16 descCRCLength; __le32 tagLocation; -} __attribute__ ((packed)); +} __packed; /* Tag Identifier (ECMA 167r3 3/7.2.1) */ #define TAG_IDENT_PVD 0x0001 @@ -186,7 +186,7 @@ struct NSRDesc { uint8_t structVersion; uint8_t reserved; uint8_t structData[2040]; -} __attribute__ ((packed)); +} __packed; /* Primary Volume Descriptor (ECMA 167r3 3/10.1) */ struct primaryVolDesc { @@ -212,7 +212,7 @@ struct primaryVolDesc { __le32 predecessorVolDescSeqLocation; __le16 flags; uint8_t reserved[22]; -} __attribute__ ((packed)); +} __packed; /* Flags (ECMA 167r3 3/10.1.21) */ #define PVD_FLAGS_VSID_COMMON 0x0001 @@ -223,7 +223,7 @@ struct anchorVolDescPtr { struct extent_admainVolDescSeqExt; struct extent_adreserveVolDescSeqExt; uint8_t reserved[480]; -} __attribute__ ((packed)); +} __packed; /* Volume Descriptor Pointer (ECMA 167r3 3/10.3) */ struct volDescPtr { @@ -231,7 +231,7 @@ struct volDescPtr { __le32 volDescSeqNum; struct extent_adnextVolDescSeqExt; uint8_t reserved[484]; -} __attribute__ ((packed)); +} __packed; /* Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */ struct impUseVolDesc { @@ -239,7 +239,7 @@ struct impUseVolDesc { __le32 volDescSeqNum; struct regidimpIdent; uint8_t impUse[460]; -} __attribute__ ((packed)); +} __packed; /* Partition Descriptor (ECMA 167r3 3/10.5) */ struct partitionDesc { @@ -255,7 +255,7 @@ struct partitionDesc { struct regid impIdent; uint8_t impUse[128]; uint8_t reserved[156]; -} __attribute__ ((packed)); +} __packed; /* Partition Flags (ECMA 167r3 3/10.5.3) */ #define PD_PARTITION_FLAGS_ALLOC 0x0001 @@ -291,14 +291,14 @@ struct logicalVolDesc { uint8_t impUse[128]; struct extent_adintegritySeqExt; uint8_t partitionMaps[0]; -} __attribute__ ((packed)); +} __packed; /* Generic
[PATCH 01/12 linux-next] udf: use __packed instead of __attribute__ ((packed))
defined in linux/compiler-gcc.h Signed-off-by: Fabian Frederick --- fs/udf/ecma_167.h | 98 +++ fs/udf/osta_udf.h | 34 +-- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h index 4792b77..9f24bd1 100644 --- a/fs/udf/ecma_167.h +++ b/fs/udf/ecma_167.h @@ -41,7 +41,7 @@ struct charspec { uint8_t charSetType; uint8_t charSetInfo[63]; -} __attribute__ ((packed)); +} __packed; /* Character Set Type (ECMA 167r3 1/7.2.1.1) */ #define CHARSPEC_TYPE_CS0 0x00/* (1/7.2.2) */ @@ -68,7 +68,7 @@ struct timestamp { uint8_t centiseconds; uint8_t hundredsOfMicroseconds; uint8_t microseconds; -} __attribute__ ((packed)); +} __packed; /* Type and Time Zone (ECMA 167r3 1/7.3.1) */ #define TIMESTAMP_TYPE_MASK0xF000 @@ -82,7 +82,7 @@ struct regid { uint8_t flags; uint8_t ident[23]; uint8_t identSuffix[8]; -} __attribute__ ((packed)); +} __packed; /* Flags (ECMA 167r3 1/7.4.1) */ #define ENTITYID_FLAGS_DIRTY 0x00 @@ -95,7 +95,7 @@ struct volStructDesc { uint8_t stdIdent[VSD_STD_ID_LEN]; uint8_t structVersion; uint8_t structData[2041]; -} __attribute__ ((packed)); +} __packed; /* Standard Identifier (EMCA 167r2 2/9.1.2) */ #define VSD_STD_ID_NSR02 "NSR02" /* (3/9.1) */ @@ -114,7 +114,7 @@ struct beginningExtendedAreaDesc { uint8_t stdIdent[VSD_STD_ID_LEN]; uint8_t structVersion; uint8_t structData[2041]; -} __attribute__ ((packed)); +} __packed; /* Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */ struct terminatingExtendedAreaDesc { @@ -122,7 +122,7 @@ struct terminatingExtendedAreaDesc { uint8_t stdIdent[VSD_STD_ID_LEN]; uint8_t structVersion; uint8_t structData[2041]; -} __attribute__ ((packed)); +} __packed; /* Boot Descriptor (ECMA 167r3 2/9.4) */ struct bootDesc { @@ -140,7 +140,7 @@ struct bootDesc { __le16 flags; uint8_t reserved2[32]; uint8_t bootUse[1906]; -} __attribute__ ((packed)); +} __packed; /* Flags (ECMA 167r3 2/9.4.12) */ #define BOOT_FLAGS_ERASE 0x01 @@ -149,7 +149,7 @@ struct bootDesc { struct extent_ad { __le32 extLength; __le32 extLocation; -} __attribute__ ((packed)); +} __packed; struct kernel_extent_ad { uint32_textLength; @@ -166,7 +166,7 @@ struct tag { __le16 descCRC; __le16 descCRCLength; __le32 tagLocation; -} __attribute__ ((packed)); +} __packed; /* Tag Identifier (ECMA 167r3 3/7.2.1) */ #define TAG_IDENT_PVD 0x0001 @@ -186,7 +186,7 @@ struct NSRDesc { uint8_t structVersion; uint8_t reserved; uint8_t structData[2040]; -} __attribute__ ((packed)); +} __packed; /* Primary Volume Descriptor (ECMA 167r3 3/10.1) */ struct primaryVolDesc { @@ -212,7 +212,7 @@ struct primaryVolDesc { __le32 predecessorVolDescSeqLocation; __le16 flags; uint8_t reserved[22]; -} __attribute__ ((packed)); +} __packed; /* Flags (ECMA 167r3 3/10.1.21) */ #define PVD_FLAGS_VSID_COMMON 0x0001 @@ -223,7 +223,7 @@ struct anchorVolDescPtr { struct extent_admainVolDescSeqExt; struct extent_adreserveVolDescSeqExt; uint8_t reserved[480]; -} __attribute__ ((packed)); +} __packed; /* Volume Descriptor Pointer (ECMA 167r3 3/10.3) */ struct volDescPtr { @@ -231,7 +231,7 @@ struct volDescPtr { __le32 volDescSeqNum; struct extent_adnextVolDescSeqExt; uint8_t reserved[484]; -} __attribute__ ((packed)); +} __packed; /* Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */ struct impUseVolDesc { @@ -239,7 +239,7 @@ struct impUseVolDesc { __le32 volDescSeqNum; struct regidimpIdent; uint8_t impUse[460]; -} __attribute__ ((packed)); +} __packed; /* Partition Descriptor (ECMA 167r3 3/10.5) */ struct partitionDesc { @@ -255,7 +255,7 @@ struct partitionDesc { struct regid impIdent; uint8_t impUse[128]; uint8_t reserved[156]; -} __attribute__ ((packed)); +} __packed; /* Partition Flags (ECMA 167r3 3/10.5.3) */ #define PD_PARTITION_FLAGS_ALLOC 0x0001 @@ -291,14 +291,14 @@ struct logicalVolDesc { uint8_t impUse[128]; struct extent_adintegritySeqExt; uint8_t partitionMaps[0]; -} __attribute__ ((packed)); +} __packed; /* Generic Partition Map (ECMA