diff options
-rw-r--r-- | drivers/md/persistent-data/dm-space-map-common.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/md/persistent-data/dm-space-map-common.c b/drivers/md/persistent-data/dm-space-map-common.c index 829b4ce057d8..0a3b8ae4a29c 100644 --- a/drivers/md/persistent-data/dm-space-map-common.c +++ b/drivers/md/persistent-data/dm-space-map-common.c | |||
@@ -69,9 +69,9 @@ static struct dm_block_validator index_validator = { | |||
69 | */ | 69 | */ |
70 | #define BITMAP_CSUM_XOR 240779 | 70 | #define BITMAP_CSUM_XOR 240779 |
71 | 71 | ||
72 | static void bitmap_prepare_for_write(struct dm_block_validator *v, | 72 | static void dm_bitmap_prepare_for_write(struct dm_block_validator *v, |
73 | struct dm_block *b, | 73 | struct dm_block *b, |
74 | size_t block_size) | 74 | size_t block_size) |
75 | { | 75 | { |
76 | struct disk_bitmap_header *disk_header = dm_block_data(b); | 76 | struct disk_bitmap_header *disk_header = dm_block_data(b); |
77 | 77 | ||
@@ -81,9 +81,9 @@ static void bitmap_prepare_for_write(struct dm_block_validator *v, | |||
81 | BITMAP_CSUM_XOR)); | 81 | BITMAP_CSUM_XOR)); |
82 | } | 82 | } |
83 | 83 | ||
84 | static int bitmap_check(struct dm_block_validator *v, | 84 | static int dm_bitmap_check(struct dm_block_validator *v, |
85 | struct dm_block *b, | 85 | struct dm_block *b, |
86 | size_t block_size) | 86 | size_t block_size) |
87 | { | 87 | { |
88 | struct disk_bitmap_header *disk_header = dm_block_data(b); | 88 | struct disk_bitmap_header *disk_header = dm_block_data(b); |
89 | __le32 csum_disk; | 89 | __le32 csum_disk; |
@@ -108,8 +108,8 @@ static int bitmap_check(struct dm_block_validator *v, | |||
108 | 108 | ||
109 | static struct dm_block_validator dm_sm_bitmap_validator = { | 109 | static struct dm_block_validator dm_sm_bitmap_validator = { |
110 | .name = "sm_bitmap", | 110 | .name = "sm_bitmap", |
111 | .prepare_for_write = bitmap_prepare_for_write, | 111 | .prepare_for_write = dm_bitmap_prepare_for_write, |
112 | .check = bitmap_check | 112 | .check = dm_bitmap_check, |
113 | }; | 113 | }; |
114 | 114 | ||
115 | /*----------------------------------------------------------------*/ | 115 | /*----------------------------------------------------------------*/ |
@@ -124,7 +124,7 @@ static void *dm_bitmap_data(struct dm_block *b) | |||
124 | 124 | ||
125 | #define WORD_MASK_HIGH 0xAAAAAAAAAAAAAAAAULL | 125 | #define WORD_MASK_HIGH 0xAAAAAAAAAAAAAAAAULL |
126 | 126 | ||
127 | static unsigned bitmap_word_used(void *addr, unsigned b) | 127 | static unsigned dm_bitmap_word_used(void *addr, unsigned b) |
128 | { | 128 | { |
129 | __le64 *words_le = addr; | 129 | __le64 *words_le = addr; |
130 | __le64 *w_le = words_le + (b >> ENTRIES_SHIFT); | 130 | __le64 *w_le = words_le + (b >> ENTRIES_SHIFT); |
@@ -170,7 +170,7 @@ static int sm_find_free(void *addr, unsigned begin, unsigned end, | |||
170 | { | 170 | { |
171 | while (begin < end) { | 171 | while (begin < end) { |
172 | if (!(begin & (ENTRIES_PER_WORD - 1)) && | 172 | if (!(begin & (ENTRIES_PER_WORD - 1)) && |
173 | bitmap_word_used(addr, begin)) { | 173 | dm_bitmap_word_used(addr, begin)) { |
174 | begin += ENTRIES_PER_WORD; | 174 | begin += ENTRIES_PER_WORD; |
175 | continue; | 175 | continue; |
176 | } | 176 | } |