block: Use macros from compiler.h instead of __attribute__((...))

To increase compiler portability there are several macros defined
in <linux/compiler.h> for various gcc __attribute((..)) constructs.
I've made sure gcc these specific were replaced with the right
macro and an #include <linux/compiler.h> was placed where needed.

Signed-off-by: Gideon Israel Dsouza <gidisrael@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/partitions/atari.h b/block/partitions/atari.h
index fe2d32a89f366741c593a06275d774377c0e6157..f2ec43bfeec139b59b8a2dd0ecef47a7e86dc488 100644 (file)
--- a/block/partitions/atari.h
+++ b/block/partitions/atari.h
@@ -11,6 +11,8 @@
  * by Guenther Kelleter (guenther@pool.informatik.rwth-aachen.de)
  */
 
+#include <linux/compiler.h>
+
 struct partition_info
 {
   u8 flg;                      /* bit 0: active; bit 7: bootable */
@@ -29,6 +31,6 @@ struct rootsector
   u32 bsl_st;                  /* start of bad sector list */
   u32 bsl_cnt;                 /* length of bad sector list */
   u16 checksum;                        /* checksum for bootable disks */
-} __attribute__((__packed__));
+} __packed;
 
 int atari_partition(struct parsed_partitions *state);

diff --git a/block/partitions/efi.h b/block/partitions/efi.h
index 4efcafba7e6455acd1361087eafcf086722f98d9..abd0b19288a66935ead285a071e44c689fe770cd 100644 (file)
--- a/block/partitions/efi.h
+++ b/block/partitions/efi.h
@@ -32,6 +32,7 @@
 #include <linux/major.h>
 #include <linux/string.h>
 #include <linux/efi.h>
+#include <linux/compiler.h>
 
 #define MSDOS_MBR_SIGNATURE 0xaa55
 #define EFI_PMBR_OSTYPE_EFI 0xEF
@@ -87,13 +88,13 @@ typedef struct _gpt_header {
         *
         * uint8_t              reserved2[ BlockSize - 92 ];
         */
-} __attribute__ ((packed)) gpt_header;
+} __packed gpt_header;
 
 typedef struct _gpt_entry_attributes {
        u64 required_to_function:1;
        u64 reserved:47;
         u64 type_guid_specific:16;
-} __attribute__ ((packed)) gpt_entry_attributes;
+} __packed gpt_entry_attributes;
 
 typedef struct _gpt_entry {
        efi_guid_t partition_type_guid;
@@ -102,7 +103,7 @@ typedef struct _gpt_entry {
        __le64 ending_lba;
        gpt_entry_attributes attributes;
        efi_char16_t partition_name[72 / sizeof (efi_char16_t)];
-} __attribute__ ((packed)) gpt_entry;
+} __packed gpt_entry;
 
 typedef struct _gpt_mbr_record {
        u8      boot_indicator; /* unused by EFI, set to 0x80 for bootable */
@@ -124,7 +125,7 @@ typedef struct _legacy_mbr {
        __le16 unknown;
        gpt_mbr_record partition_record[4];
        __le16 signature;
-} __attribute__ ((packed)) legacy_mbr;
+} __packed legacy_mbr;
 
 /* Functions */
 extern int efi_partition(struct parsed_partitions *state);

diff --git a/block/partitions/karma.c b/block/partitions/karma.c
index 0ea19312706baefaf6a516ce34293abab881decc..9721fa589bb17f8b0740bcc14df09e179ce4f636 100644 (file)
--- a/block/partitions/karma.c
+++ b/block/partitions/karma.c
@@ -8,6 +8,7 @@
 
 #include "check.h"
 #include "karma.h"
+#include <linux/compiler.h>
 
 int karma_partition(struct parsed_partitions *state)
 {
@@ -26,7 +27,7 @@ int karma_partition(struct parsed_partitions *state)
                } d_partitions[2];
                u8 d_blank[208];
                __le16 d_magic;
-       } __attribute__((packed)) *label;
+       } __packed *label;
        struct d_partition *p;
 
        data = read_part_sector(state, 0, &sect);