From 84fcff607a8ab2c71fed02d8132175fc95e884a3 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 19 Mar 2012 12:46:40 +1100
Subject: [PATCH] --- yaml --- r: 292799 b: refs/heads/master c:
 4ba97dff719b4cbeb7a4f6beddd2feb7404102d8 h: refs/heads/master i:   292797:
 b891eaa1eab510186611d4663f2fde8f94a7ae1a   292795:
 f7cbf24973e0faa08e534f159ab2b715ec578d92   292791:
 94bf4e0d138d25ce11359487717d24c1e9ecdb9d   292783:
 9b0a029b25422fd8d618ebf120797c873b2bc358   292767:
 952bfa2ee4f5cb0478f6e4d828468cd7750076e5   292735:
 878d44e9de26729a827fdfe5e8b52c5bc80b9726 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/md/bitmap.h | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 66cc86d4fd38..3ddf51478e4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 006a09a0ae0a494473a8cd82c8d1d653e37e6663
+refs/heads/master: 4ba97dff719b4cbeb7a4f6beddd2feb7404102d8
diff --git a/trunk/drivers/md/bitmap.h b/trunk/drivers/md/bitmap.h
index a15436dd9b3e..557e3e8ea73b 100644
--- a/trunk/drivers/md/bitmap.h
+++ b/trunk/drivers/md/bitmap.h
@@ -13,8 +13,6 @@
 #define BITMAP_MAJOR_HI 4
 #define	BITMAP_MAJOR_HOSTENDIAN 3
 
-#define BITMAP_MINOR 39
-
 /*
  * in-memory bitmap:
  *
@@ -101,21 +99,11 @@ typedef __u16 bitmap_counter_t;
 /* same, except a mask value for more efficient bitops */
 #define PAGE_COUNTER_MASK  (PAGE_COUNTER_RATIO - 1)
 
-#define BITMAP_BLOCK_SIZE 512
 #define BITMAP_BLOCK_SHIFT 9
 
 /* how many blocks per chunk? (this is variable) */
 #define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->mddev->bitmap_info.chunksize >> BITMAP_BLOCK_SHIFT)
 #define CHUNK_BLOCK_SHIFT(bitmap) ((bitmap)->chunkshift - BITMAP_BLOCK_SHIFT)
-#define CHUNK_BLOCK_MASK(bitmap) (CHUNK_BLOCK_RATIO(bitmap) - 1)
-
-/* when hijacked, the counters and bits represent even larger "chunks" */
-/* there will be 1024 chunks represented by each counter in the page pointers */
-#define PAGEPTR_BLOCK_RATIO(bitmap) \
-			(CHUNK_BLOCK_RATIO(bitmap) << PAGE_COUNTER_SHIFT >> 1)
-#define PAGEPTR_BLOCK_SHIFT(bitmap) \
-			(CHUNK_BLOCK_SHIFT(bitmap) + PAGE_COUNTER_SHIFT - 1)
-#define PAGEPTR_BLOCK_MASK(bitmap) (PAGEPTR_BLOCK_RATIO(bitmap) - 1)
 
 #endif
 
@@ -181,12 +169,6 @@ struct bitmap_page {
 	unsigned int  count:31;
 };
 
-/* keep track of bitmap file pages that have pending writes on them */
-struct page_list {
-	struct list_head list;
-	struct page *page;
-};
-
 /* the main bitmap structure - one per mddev */
 struct bitmap {
 	struct bitmap_page *bp;