Skip to content

Commit

Permalink
md/bitmap: remove unused fields from struct bitmap
Browse files Browse the repository at this point in the history
Get rid of ->syncchunk and ->counter_bits since they're never used.

Also discard COUNTER_BYTE_RATIO which is unused.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
Namhyung Kim authored and NeilBrown committed Jun 9, 2011
1 parent 27d5ea0 commit 97b3d4a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
3 changes: 0 additions & 3 deletions drivers/md/bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1837,9 +1837,6 @@ int bitmap_create(mddev_t *mddev)
bitmap->chunks = chunks;
bitmap->pages = pages;
bitmap->missing_pages = pages;
bitmap->counter_bits = COUNTER_BITS;

bitmap->syncchunk = ~0UL;

#ifdef INJECT_FATAL_FAULT_1
bitmap->bp = NULL;
Expand Down
10 changes: 0 additions & 10 deletions drivers/md/bitmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
typedef __u16 bitmap_counter_t;
#define COUNTER_BITS 16
#define COUNTER_BIT_SHIFT 4
#define COUNTER_BYTE_RATIO (COUNTER_BITS / 8)
#define COUNTER_BYTE_SHIFT (COUNTER_BIT_SHIFT - 3)

#define NEEDED_MASK ((bitmap_counter_t) (1 << (COUNTER_BITS - 1)))
Expand Down Expand Up @@ -196,19 +195,10 @@ struct bitmap {

mddev_t *mddev; /* the md device that the bitmap is for */

int counter_bits; /* how many bits per block counter */

/* bitmap chunksize -- how much data does each bit represent? */
unsigned long chunkshift; /* chunksize = 2^chunkshift (for bitops) */
unsigned long chunks; /* total number of data chunks for the array */

/* We hold a count on the chunk currently being synced, and drop
* it when the last block is started. If the resync is aborted
* midway, we need to be able to drop that count, so we remember
* the counted chunk..
*/
unsigned long syncchunk;

__u64 events_cleared;
int need_sync;

Expand Down

0 comments on commit 97b3d4a

Please sign in to comment.