From 07c9893c63da55bf47ae2ee0c615893529695062 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 26 Jun 2006 00:27:47 -0700
Subject: [PATCH] --- yaml --- r: 30371 b: refs/heads/master c:
 0cdd02cabd86b5d547f882005e23a93929f0ace9 h: refs/heads/master i:   30369:
 59067e218b1d00f35d895e7d86a86f3a28e9e776   30367:
 d5aaf83c53fb3426dca2e97e4269eea60fc4af60 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/md/bitmap.c | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index a55e85ef866f..603ef180e4ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a647e4bc5ce697e25ff50d2e22de68a581b1ed38
+refs/heads/master: 0cdd02cabd86b5d547f882005e23a93929f0ace9
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 609e68d3e1bc..dfe5e12741ba 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -14,9 +14,6 @@
  *
  * flush after percent set rather than just time based. (maybe both).
  * wait if count gets too high, wake when it drops to half.
- * allow bitmap to be mirrored with superblock (before or after...)
- * allow hot-add to re-instate a current device.
- * allow hot-add of bitmap after quiessing device
  */
 
 #include <linux/module.h>
@@ -70,23 +67,6 @@ static inline char * bmname(struct bitmap *bitmap)
 	return bitmap->mddev ? mdname(bitmap->mddev) : "mdX";
 }
 
-
-/*
- * test if the bitmap is active
- */
-int bitmap_active(struct bitmap *bitmap)
-{
-	unsigned long flags;
-	int res = 0;
-
-	if (!bitmap)
-		return res;
-	spin_lock_irqsave(&bitmap->lock, flags);
-	res = bitmap->flags & BITMAP_ACTIVE;
-	spin_unlock_irqrestore(&bitmap->lock, flags);
-	return res;
-}
-
 #define WRITE_POOL_SIZE 256
 
 /*
@@ -1496,8 +1476,6 @@ int bitmap_create(mddev_t *mddev)
 	if (!bitmap->bp)
 		goto error;
 
-	bitmap->flags |= BITMAP_ACTIVE;
-
 	/* now that we have some pages available, initialize the in-memory
 	 * bitmap from the on-disk bitmap */
 	start = 0;