Change fast ext2fs bitmap functions to use the generic bitmap functions

This changes ext2fs_fast_{mark,unmark,test}_{inode,block}_bitmap() to
be inline functions which calls ext2fs_{mark,unmark,test}_generic_bitmap().

This is part of the preparation to support the new-style bitmaps.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
index 74fb8b3..474a069 100644 (file)
--- a/lib/ext2fs/bitops.h
+++ b/lib/ext2fs/bitops.h
@@ -449,79 +449,39 @@ _INLINE_ int ext2fs_test_inode_bitmap(ext2fs_inode_bitmap bitmap,
 _INLINE_ void ext2fs_fast_mark_block_bitmap(ext2fs_block_bitmap bitmap,
                                            blk_t block)
 {
-#ifdef EXT2FS_DEBUG_FAST_OPS
-       if ((block < bitmap->start) || (block > bitmap->end)) {
-               ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_MARK, block,
-                                  bitmap->description);
-               return;
-       }
-#endif 
-       ext2fs_fast_set_bit(block - bitmap->start, bitmap->bitmap);
+       ext2fs_mark_generic_bitmap((ext2fs_generic_bitmap) bitmap, block);
 }
 
 _INLINE_ void ext2fs_fast_unmark_block_bitmap(ext2fs_block_bitmap bitmap,
                                              blk_t block)
 {
-#ifdef EXT2FS_DEBUG_FAST_OPS
-       if ((block < bitmap->start) || (block > bitmap->end)) {
-               ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_UNMARK,
-                                  block, bitmap->description);
-               return;
-       }
-#endif
-       ext2fs_fast_clear_bit(block - bitmap->start, bitmap->bitmap);
+       ext2fs_unmark_generic_bitmap((ext2fs_generic_bitmap) bitmap, block);
 }
 
 _INLINE_ int ext2fs_fast_test_block_bitmap(ext2fs_block_bitmap bitmap,
                                            blk_t block)
 {
-#ifdef EXT2FS_DEBUG_FAST_OPS
-       if ((block < bitmap->start) || (block > bitmap->end)) {
-               ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
-                                  block, bitmap->description);
-               return 0;
-       }
-#endif
-       return ext2fs_test_bit(block - bitmap->start, bitmap->bitmap);
+       return ext2fs_test_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
+                                         block);
 }
 
 _INLINE_ void ext2fs_fast_mark_inode_bitmap(ext2fs_inode_bitmap bitmap,
                                            ext2_ino_t inode)
 {
-#ifdef EXT2FS_DEBUG_FAST_OPS
-       if ((inode < bitmap->start) || (inode > bitmap->end)) {
-               ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_MARK,
-                                  inode, bitmap->description);
-               return;
-       }
-#endif
-       ext2fs_fast_set_bit(inode - bitmap->start, bitmap->bitmap);
+       ext2fs_mark_generic_bitmap((ext2fs_generic_bitmap) bitmap, inode);
 }
 
 _INLINE_ void ext2fs_fast_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap,
                                              ext2_ino_t inode)
 {
-#ifdef EXT2FS_DEBUG_FAST_OPS
-       if ((inode < bitmap->start) || (inode > bitmap->end)) {
-               ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_UNMARK,
-                                  inode, bitmap->description);
-               return;
-       }
-#endif
-       ext2fs_fast_clear_bit(inode - bitmap->start, bitmap->bitmap);
+       ext2fs_unmark_generic_bitmap((ext2fs_generic_bitmap) bitmap, inode);
 }
 
 _INLINE_ int ext2fs_fast_test_inode_bitmap(ext2fs_inode_bitmap bitmap,
                                           ext2_ino_t inode)
 {
-#ifdef EXT2FS_DEBUG_FAST_OPS
-       if ((inode < bitmap->start) || (inode > bitmap->end)) {
-               ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST,
-                                  inode, bitmap->description);
-               return 0;
-       }
-#endif
-       return ext2fs_test_bit(inode - bitmap->start, bitmap->bitmap);
+       return ext2fs_test_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
+                                         inode);
 }
 
 _INLINE_ blk_t ext2fs_get_block_bitmap_start(ext2fs_block_bitmap bitmap)