summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Mauelshagen <heinzm@redhat.com>2023-02-07 18:38:28 +0100
committerMike Snitzer <snitzer@kernel.org>2023-02-14 14:23:07 -0500
commitae99111ecf70c3003b4b1ba38b95fbe35410b2a6 (patch)
tree7f5c9a444f27b350fd9e1dc46b241d42ed2f1e8c
parentf8922a48291d40c4fb07d66ef88c69ea415d8cd9 (diff)
dm: favour __packed versus "__attribute__ ((packed))"
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
-rw-r--r--drivers/md/persistent-data/dm-btree-internal.h4
-rw-r--r--drivers/md/persistent-data/dm-space-map-common.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
index 69fb47521edd..7ed2ce656fcc 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);
+} __packed __aligned(8);
struct btree_node {
struct node_header header;
__le64 keys[];
-} __attribute__ ((packed)) __aligned(8);
+} __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 27bd5d9ed2e9..e83d1f225078 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);
+} __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);
+} __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);
+} __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);
+} __packed __aligned(8);
/*----------------------------------------------------------------*/