Commit 0cdd02ca authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

[PATCH] md/bitmap: remove dead code from md/bitmap

bitmap_active is never called, and the BITMAP_ACTIVE flag is never users or
tested, so discard them both.

Also remove some out-of-date 'todo' comments.
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a647e4bc
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
* *
* flush after percent set rather than just time based. (maybe both). * flush after percent set rather than just time based. (maybe both).
* wait if count gets too high, wake when it drops to half. * 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> #include <linux/module.h>
...@@ -70,23 +67,6 @@ static inline char * bmname(struct bitmap *bitmap) ...@@ -70,23 +67,6 @@ static inline char * bmname(struct bitmap *bitmap)
return bitmap->mddev ? mdname(bitmap->mddev) : "mdX"; 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 #define WRITE_POOL_SIZE 256
/* /*
...@@ -1496,8 +1476,6 @@ int bitmap_create(mddev_t *mddev) ...@@ -1496,8 +1476,6 @@ int bitmap_create(mddev_t *mddev)
if (!bitmap->bp) if (!bitmap->bp)
goto error; goto error;
bitmap->flags |= BITMAP_ACTIVE;
/* now that we have some pages available, initialize the in-memory /* now that we have some pages available, initialize the in-memory
* bitmap from the on-disk bitmap */ * bitmap from the on-disk bitmap */
start = 0; start = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment