From 271a375b596240866b4a2967e3b6f38ff7cecdf8 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 22 Jul 2007 19:16:08 -0400 Subject: [PATCH] Move ext2fs_get_{block,inode}_bitmap_{start,end}() to generic functions Create ext2fs_get_generic_bitmap_{start,end}() and use them for inline functions. Signed-off-by: "Theodore Ts'o" --- lib/ext2fs/bitops.h | 11 ++++++----- lib/ext2fs/gen_bitmap.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h index b857cad..eed1a49 100644 --- a/lib/ext2fs/bitops.h +++ b/lib/ext2fs/bitops.h @@ -113,7 +113,8 @@ extern int ext2fs_test_generic_bitmap(ext2fs_generic_bitmap bitmap, blk_t bitno); extern int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap, blk_t block, int num); - +extern __u32 ext2fs_get_generic_bitmap_start(ext2fs_generic_bitmap bitmap); +extern __u32 ext2fs_get_generic_bitmap_end(ext2fs_generic_bitmap bitmap); /* * The inline routines themselves... @@ -489,22 +490,22 @@ _INLINE_ int ext2fs_fast_test_inode_bitmap(ext2fs_inode_bitmap bitmap, _INLINE_ blk_t ext2fs_get_block_bitmap_start(ext2fs_block_bitmap bitmap) { - return bitmap->start; + return ext2fs_get_generic_bitmap_start((ext2fs_generic_bitmap) bitmap); } _INLINE_ ext2_ino_t ext2fs_get_inode_bitmap_start(ext2fs_inode_bitmap bitmap) { - return bitmap->start; + return ext2fs_get_generic_bitmap_start((ext2fs_generic_bitmap) bitmap); } _INLINE_ blk_t ext2fs_get_block_bitmap_end(ext2fs_block_bitmap bitmap) { - return bitmap->end; + return ext2fs_get_generic_bitmap_end((ext2fs_generic_bitmap) bitmap); } _INLINE_ ext2_ino_t ext2fs_get_inode_bitmap_end(ext2fs_inode_bitmap bitmap) { - return bitmap->end; + return ext2fs_get_generic_bitmap_end((ext2fs_generic_bitmap) bitmap); } _INLINE_ int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap, diff --git a/lib/ext2fs/gen_bitmap.c b/lib/ext2fs/gen_bitmap.c index 08592b4..53a9b9e 100644 --- a/lib/ext2fs/gen_bitmap.c +++ b/lib/ext2fs/gen_bitmap.c @@ -57,6 +57,16 @@ int ext2fs_unmark_generic_bitmap(ext2fs_generic_bitmap bitmap, return ext2fs_clear_bit(bitno - bitmap->start, bitmap->bitmap); } +__u32 ext2fs_get_generic_bitmap_start(ext2fs_generic_bitmap bitmap) +{ + return bitmap->start; +} + +__u32 ext2fs_get_generic_bitmap_end(ext2fs_generic_bitmap bitmap) +{ + return bitmap->end; +} + int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap, blk_t block, int num) { -- 1.8.3.1