[dm-devel] [PATCH 23/39] dm: favour __aligned(N) versus "__attribute__ (aligned(N))"

[Mike Snitzer]

From: Heinz Mauelshagen <hei...@redhat.com>

Signed-off-by: Heinz Mauelshagen <hei...@redhat.com>
Signed-off-by: Mike Snitzer <snit...@kernel.org>
---
 drivers/md/dm-io.c                               | 2 +-
 drivers/md/persistent-data/dm-btree-internal.h   | 4 ++--
 drivers/md/persistent-data/dm-space-map-common.h | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index faa8d0e1b460..9844edc1ae7c 100644
--- 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 bd353a00372d..62f8adf0b3eb 100644
--- 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 292a91871d92..21755296fda7 100644
--- 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);
 
 /*----------------------------------------------------------------*/
 
-- 
2.37.0 (Apple Git-136)

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel