Commit f8922a48 authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer
Browse files

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



Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
parent 6a808034

drivers/md/dm-io.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/md/persistent-data/dm-btree-internal.h

+2 −2
Original line number Diff line number Diff line
@@ -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);





/*

drivers/md/persistent-data/dm-space-map-common.h

+4 −4
Original line number Diff line number Diff line
@@ -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);



/*----------------------------------------------------------------*/