Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[safe/jmp/linux-2.6] / drivers / md / bitmap.h

diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 50ee424..3797dea 100644 (file)
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -118,16 +118,6 @@ typedef __u16 bitmap_counter_t;
                        (CHUNK_BLOCK_SHIFT(bitmap) + PAGE_COUNTER_SHIFT - 1)
 #define PAGEPTR_BLOCK_MASK(bitmap) (PAGEPTR_BLOCK_RATIO(bitmap) - 1)
 
-/*
- * on-disk bitmap:
- *
- * Use one bit per "chunk" (block set). We do the disk I/O on the bitmap
- * file a page at a time. There's a superblock at the start of the file.
- */
-
-/* map chunks (bits) to file pages - offset by the size of the superblock */
-#define CHUNK_BIT_OFFSET(chunk) ((chunk) + (sizeof(bitmap_super_t) << 3))
-
 #endif
 
 /*
@@ -237,6 +227,7 @@ struct bitmap {
        int allclean;
 
        atomic_t behind_writes;
+       unsigned long behind_writes_used; /* highest actual value at runtime */
 
        /*
         * the bitmap daemon - periodically wakes up and sweeps the bitmap
@@ -249,7 +240,9 @@ struct bitmap {
        atomic_t pending_writes; /* pending writes to the bitmap file */
        wait_queue_head_t write_wait;
        wait_queue_head_t overflow_wait;
+       wait_queue_head_t behind_wait;
 
+       struct sysfs_dirent *sysfs_can_clear;
 };
 
 /* the bitmap API */