From: NeilBrown 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: Neil Brown Signed-off-by: Andrew Morton --- drivers/md/bitmap.c | 22 ---------------------- 1 files changed, 22 deletions(-) diff -puN drivers/md/bitmap.c~md-bitmap-remove-dead-code-from-md-bitmap drivers/md/bitmap.c --- 25/drivers/md/bitmap.c~md-bitmap-remove-dead-code-from-md-bitmap Fri May 12 10:24:48 2006 +++ 25-akpm/drivers/md/bitmap.c Fri May 12 10:24:48 2006 @@ -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 @@ -70,23 +67,6 @@ static inline char * bmname(struct bitma 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; _