diff options
-rw-r--r-- | drivers/md/bitmap.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h index a15436dd9b3e..557e3e8ea73b 100644 --- a/drivers/md/bitmap.h +++ b/drivers/md/bitmap.h | |||
@@ -13,8 +13,6 @@ | |||
13 | #define BITMAP_MAJOR_HI 4 | 13 | #define BITMAP_MAJOR_HI 4 |
14 | #define BITMAP_MAJOR_HOSTENDIAN 3 | 14 | #define BITMAP_MAJOR_HOSTENDIAN 3 |
15 | 15 | ||
16 | #define BITMAP_MINOR 39 | ||
17 | |||
18 | /* | 16 | /* |
19 | * in-memory bitmap: | 17 | * in-memory bitmap: |
20 | * | 18 | * |
@@ -101,21 +99,11 @@ typedef __u16 bitmap_counter_t; | |||
101 | /* same, except a mask value for more efficient bitops */ | 99 | /* same, except a mask value for more efficient bitops */ |
102 | #define PAGE_COUNTER_MASK (PAGE_COUNTER_RATIO - 1) | 100 | #define PAGE_COUNTER_MASK (PAGE_COUNTER_RATIO - 1) |
103 | 101 | ||
104 | #define BITMAP_BLOCK_SIZE 512 | ||
105 | #define BITMAP_BLOCK_SHIFT 9 | 102 | #define BITMAP_BLOCK_SHIFT 9 |
106 | 103 | ||
107 | /* how many blocks per chunk? (this is variable) */ | 104 | /* how many blocks per chunk? (this is variable) */ |
108 | #define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->mddev->bitmap_info.chunksize >> BITMAP_BLOCK_SHIFT) | 105 | #define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->mddev->bitmap_info.chunksize >> BITMAP_BLOCK_SHIFT) |
109 | #define CHUNK_BLOCK_SHIFT(bitmap) ((bitmap)->chunkshift - BITMAP_BLOCK_SHIFT) | 106 | #define CHUNK_BLOCK_SHIFT(bitmap) ((bitmap)->chunkshift - BITMAP_BLOCK_SHIFT) |
110 | #define CHUNK_BLOCK_MASK(bitmap) (CHUNK_BLOCK_RATIO(bitmap) - 1) | ||
111 | |||
112 | /* when hijacked, the counters and bits represent even larger "chunks" */ | ||
113 | /* there will be 1024 chunks represented by each counter in the page pointers */ | ||
114 | #define PAGEPTR_BLOCK_RATIO(bitmap) \ | ||
115 | (CHUNK_BLOCK_RATIO(bitmap) << PAGE_COUNTER_SHIFT >> 1) | ||
116 | #define PAGEPTR_BLOCK_SHIFT(bitmap) \ | ||
117 | (CHUNK_BLOCK_SHIFT(bitmap) + PAGE_COUNTER_SHIFT - 1) | ||
118 | #define PAGEPTR_BLOCK_MASK(bitmap) (PAGEPTR_BLOCK_RATIO(bitmap) - 1) | ||
119 | 107 | ||
120 | #endif | 108 | #endif |
121 | 109 | ||
@@ -181,12 +169,6 @@ struct bitmap_page { | |||
181 | unsigned int count:31; | 169 | unsigned int count:31; |
182 | }; | 170 | }; |
183 | 171 | ||
184 | /* keep track of bitmap file pages that have pending writes on them */ | ||
185 | struct page_list { | ||
186 | struct list_head list; | ||
187 | struct page *page; | ||
188 | }; | ||
189 | |||
190 | /* the main bitmap structure - one per mddev */ | 172 | /* the main bitmap structure - one per mddev */ |
191 | struct bitmap { | 173 | struct bitmap { |
192 | struct bitmap_page *bp; | 174 | struct bitmap_page *bp; |