From c3f9641eaf959b4222aa145477e6f0f8811244d8 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 24 Nov 2012 18:35:42 -0500 Subject: [PATCH] libext2fs: optimize rb_get_bmap_range() This simplifies the rb_get_bmap_range() function and speeds it up for the case where most of the bitmap is zero. Signed-off-by: "Theodore Ts'o" Reviewed-by: Lukas Czerner --- lib/ext2fs/blkmap64_rb.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c index 0fc7c57e..eb56c856 100644 --- a/lib/ext2fs/blkmap64_rb.c +++ b/lib/ext2fs/blkmap64_rb.c @@ -741,32 +741,23 @@ static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap, break; } - pos = start; + memset(out, 0, (num + 7) >> 3); + for (; parent != NULL; parent = next) { next = ext2fs_rb_next(parent); ext = ext2fs_rb_entry(parent, struct bmap_rb_extent, node); - while (((pos - start) < num) && - (pos < ext->start)) { - ext2fs_fast_clear_bit64((pos - start), out); - pos++; - } + pos = ext->start; + if (pos < start) + pos = start; - if ((pos - start) >= num) - return 0; - - while (((pos - start) < num) && - (pos < (ext->start + ext->count))) { + while (pos < (ext->start + ext->count)) { + if ((pos - start) >= num) + return 0; ext2fs_fast_set_bit64((pos - start), out); pos++; } } - - while ((pos - start) < num) { - ext2fs_fast_clear_bit64((pos - start), out); - pos++; - } - return 0; }