dm: favour __aligned(N) versus "__attribute__ (aligned(N))"

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index cd8dfc62677ad765c78c23d8d31e5d5220a08ea8..28da60c23f8a6ee04e3520595422158e9587abfc 100644 (file)
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -39,7 +39,7 @@ struct io {
        void *context;
        void *vma_invalidate_address;
        unsigned long vma_invalidate_size;
-} __attribute__((aligned(DM_IO_MAX_REGIONS)));
+} __aligned(DM_IO_MAX_REGIONS);
 
 static struct kmem_cache *_dm_io_cache;
 

diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
index 22e5065576b5e0f19e3908ad37a0d10779ce731c..69fb47521edd16fa54afb7f1ee86d985460fd1b7 100644 (file)
--- a/drivers/md/persistent-data/dm-btree-internal.h
+++ b/drivers/md/persistent-data/dm-btree-internal.h
@@ -35,12 +35,12 @@ struct node_header {
        __le32 max_entries;
        __le32 value_size;
        __le32 padding;
-} __attribute__((packed, aligned(8)));
+} __attribute__ ((packed)) __aligned(8);
 
 struct btree_node {
        struct node_header header;
        __le64 keys[];
-} __attribute__((packed, aligned(8)));
+} __attribute__ ((packed)) __aligned(8);
 
 
 /*

diff --git a/drivers/md/persistent-data/dm-space-map-common.h b/drivers/md/persistent-data/dm-space-map-common.h
index 75b95fe346840d87de4fb71e01c4b5406aab5a18..27bd5d9ed2e964338172863ac33a912ab0f51127 100644 (file)
--- a/drivers/md/persistent-data/dm-space-map-common.h
+++ b/drivers/md/persistent-data/dm-space-map-common.h
@@ -34,7 +34,7 @@ struct disk_index_entry {
        __le64 blocknr;
        __le32 nr_free;
        __le32 none_free_before;
-} __attribute__ ((packed, aligned(8)));
+} __attribute__ ((packed)) __aligned(8);
 
 
 #define MAX_METADATA_BITMAPS 255
@@ -44,7 +44,7 @@ struct disk_metadata_index {
        __le64 blocknr;
 
        struct disk_index_entry index[MAX_METADATA_BITMAPS];
-} __attribute__ ((packed, aligned(8)));
+} __attribute__ ((packed)) __aligned(8);
 
 struct ll_disk;
 
@@ -103,7 +103,7 @@ struct disk_sm_root {
        __le64 nr_allocated;
        __le64 bitmap_root;
        __le64 ref_count_root;
-} __attribute__ ((packed, aligned(8)));
+} __attribute__ ((packed)) __aligned(8);
 
 #define ENTRIES_PER_BYTE 4
 
@@ -111,7 +111,7 @@ struct disk_bitmap_header {
        __le32 csum;
        __le32 not_used;
        __le64 blocknr;
-} __attribute__ ((packed, aligned(8)));
+} __attribute__ ((packed)) __aligned(8);
 
 /*----------------------------------------------------------------*/