diff options
| author | Heinz Mauelshagen <heinzm@redhat.com> | 2023-02-07 18:35:43 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@kernel.org> | 2023-02-14 14:23:07 -0500 |
| commit | f8922a48291d40c4fb07d66ef88c69ea415d8cd9 (patch) | |
| tree | ea6aafb3121514f31dc1f6c70acec297670b5b80 | |
| parent | 6a808034724b5a36f8e0b712427bfbe9e667d296 (diff) | |
dm: favour __aligned(N) versus "__attribute__ (aligned(N))"
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
| -rw-r--r-- | drivers/md/dm-io.c | 2 | ||||
| -rw-r--r-- | drivers/md/persistent-data/dm-btree-internal.h | 4 | ||||
| -rw-r--r-- | 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 cd8dfc62677a..28da60c23f8a 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 22e5065576b5..69fb47521edd 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 75b95fe34684..27bd5d9ed2e9 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); /*----------------------------------------------------------------*/ |