libext2fs: remove augmented rbtree functionality

[tools/e2fsprogs.git] / lib / ext2fs / blkmap64_rb.c

diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c
index 4cbfb1e..0df58dc 100644 (file)
--- a/lib/ext2fs/blkmap64_rb.c
+++ b/lib/ext2fs/blkmap64_rb.c
@@ -80,7 +80,8 @@ static void print_tree(struct rb_root *root)
             node = ext2fs_rb_next(node)) {
                ext = node_to_extent(node);
                fprintf(stderr, "\t\t\t--> (%llu -> %llu)\n",
-                       ext->start, ext->start + ext->count);
+                       (unsigned long long) ext->start,
+                       (unsigned long long) ext->start + ext->count);
        }
        fprintf(stderr, "\t\t\t=================================\n");
 }
@@ -96,16 +97,18 @@ static void check_tree(struct rb_root *root, const char *msg)
                if (ext->count == 0) {
                        fprintf(stderr, "Tree Error: count is zero\n");
                        fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
-                               ext->start, ext->start + ext->count,
-                               ext->count);
+                               (unsigned long long) ext->start,
+                               (unsigned long long) ext->start + ext->count,
+                               (unsigned long long) ext->count);
                        goto err_out;
                }
                if (ext->start + ext->count < ext->start) {
                        fprintf(stderr,
                                "Tree Error: start or count is crazy\n");
                        fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
-                               ext->start, ext->start + ext->count,
-                               ext->count);
+                               (unsigned long long) ext->start,
+                               (unsigned long long) ext->start + ext->count,
+                               (unsigned long long) ext->count);
                        goto err_out;
                }
 
@@ -113,24 +116,28 @@ static void check_tree(struct rb_root *root, const char *msg)
                        if (old->start > ext->start) {
                                fprintf(stderr, "Tree Error: start is crazy\n");
                                fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
-                                       old->start, old->start + old->count,
-                                       old->count);
+                                       (unsigned long long) old->start,
+                                       (unsigned long long) old->start + old->count,
+                                       (unsigned long long) old->count);
                                fprintf(stderr,
                                        "extent next: %llu -> %llu (%llu)\n",
-                                       ext->start, ext->start + ext->count,
-                                       ext->count);
+                                       (unsigned long long) ext->start,
+                                       (unsigned long long) ext->start + ext->count,
+                                       (unsigned long long) ext->count);
                                goto err_out;
                        }
                        if ((old->start + old->count) >= ext->start) {
                                fprintf(stderr,
                                        "Tree Error: extent is crazy\n");
                                fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
-                                       old->start, old->start + old->count,
-                                       old->count);
+                                       (unsigned long long) old->start,
+                                       (unsigned long long) old->start + old->count,
+                                       (unsigned long long) old->count);
                                fprintf(stderr,
                                        "extent next: %llu -> %llu (%llu)\n",
-                                       ext->start, ext->start + ext->count,
-                                       ext->count);
+                                       (unsigned long long) ext->start,
+                                       (unsigned long long) ext->start + ext->count,
+                                       (unsigned long long) ext->count);
                                goto err_out;
                        }
                }
@@ -177,7 +184,7 @@ static void rb_free_extent(struct ext2fs_rb_private *bp,
        ext2fs_free_mem(&ext);
 }
 
-static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap bitmap)
+static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap_64 bitmap)
 {
        struct ext2fs_rb_private *bp;
        errcode_t       retval;
@@ -201,7 +208,7 @@ static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap bitmap)
 }
 
 static errcode_t rb_new_bmap(ext2_filsys fs EXT2FS_ATTR((unused)),
-                            ext2fs_generic_bitmap bitmap)
+                            ext2fs_generic_bitmap_64 bitmap)
 {
        errcode_t       retval;
 
@@ -225,7 +232,7 @@ static void rb_free_tree(struct rb_root *root)
        }
 }
 
-static void rb_free_bmap(ext2fs_generic_bitmap bitmap)
+static void rb_free_bmap(ext2fs_generic_bitmap_64 bitmap)
 {
        struct ext2fs_rb_private *bp;
 
@@ -236,8 +243,8 @@ static void rb_free_bmap(ext2fs_generic_bitmap bitmap)
        bp = 0;
 }
 
-static errcode_t rb_copy_bmap(ext2fs_generic_bitmap src,
-                             ext2fs_generic_bitmap dest)
+static errcode_t rb_copy_bmap(ext2fs_generic_bitmap_64 src,
+                             ext2fs_generic_bitmap_64 dest)
 {
        struct ext2fs_rb_private *src_bp, *dest_bp;
        struct bmap_rb_extent *src_ext, *dest_ext;
@@ -302,7 +309,7 @@ static void rb_truncate(__u64 new_max, struct rb_root *root)
        }
 }
 
-static errcode_t rb_resize_bmap(ext2fs_generic_bitmap bmap,
+static errcode_t rb_resize_bmap(ext2fs_generic_bitmap_64 bmap,
                                __u64 new_end, __u64 new_real_end)
 {
        struct ext2fs_rb_private *bp;
@@ -575,7 +582,7 @@ static int rb_remove_extent(__u64 start, __u64 count,
        return retval;
 }
 
-static int rb_mark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)
+static int rb_mark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)
 {
        struct ext2fs_rb_private *bp;
        int retval;
@@ -588,7 +595,7 @@ static int rb_mark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)
        return retval;
 }
 
-static int rb_unmark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)
+static int rb_unmark_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)
 {
        struct ext2fs_rb_private *bp;
        int retval;
@@ -603,7 +610,7 @@ static int rb_unmark_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)
 }
 
 inline
-static int rb_test_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)
+static int rb_test_bmap(ext2fs_generic_bitmap_64 bitmap, __u64 arg)
 {
        struct ext2fs_rb_private *bp;
 
@@ -613,7 +620,7 @@ static int rb_test_bmap(ext2fs_generic_bitmap bitmap, __u64 arg)
        return rb_test_bit(bp, arg);
 }
 
-static void rb_mark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,
+static void rb_mark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,
                                unsigned int num)
 {
        struct ext2fs_rb_private *bp;
@@ -625,7 +632,7 @@ static void rb_mark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,
        check_tree(&bp->root, __func__);
 }
 
-static void rb_unmark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,
+static void rb_unmark_bmap_extent(ext2fs_generic_bitmap_64 bitmap, __u64 arg,
                                  unsigned int num)
 {
        struct ext2fs_rb_private *bp;
@@ -637,7 +644,7 @@ static void rb_unmark_bmap_extent(ext2fs_generic_bitmap bitmap, __u64 arg,
        check_tree(&bp->root, __func__);
 }
 
-static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap bitmap,
+static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap_64 bitmap,
                                     __u64 start, unsigned int len)
 {
        struct rb_node *parent = NULL, **n;
@@ -693,7 +700,7 @@ static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap bitmap,
        return retval;
 }
 
-static errcode_t rb_set_bmap_range(ext2fs_generic_bitmap bitmap,
+static errcode_t rb_set_bmap_range(ext2fs_generic_bitmap_64 bitmap,
                                     __u64 start, size_t num, void *in)
 {
        struct ext2fs_rb_private *bp;
@@ -739,7 +746,7 @@ static errcode_t rb_set_bmap_range(ext2fs_generic_bitmap bitmap,
        return 0;
 }
 
-static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,
+static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap_64 bitmap,
                                     __u64 start, size_t num, void *out)
 {
 
@@ -804,7 +811,7 @@ static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,
        return 0;
 }
 
-static void rb_clear_bmap(ext2fs_generic_bitmap bitmap)
+static void rb_clear_bmap(ext2fs_generic_bitmap_64 bitmap)
 {
        struct ext2fs_rb_private *bp;
 
@@ -817,7 +824,7 @@ static void rb_clear_bmap(ext2fs_generic_bitmap bitmap)
        check_tree(&bp->root, __func__);
 }
 
-static errcode_t rb_find_first_zero(ext2fs_generic_bitmap bitmap,
+static errcode_t rb_find_first_zero(ext2fs_generic_bitmap_64 bitmap,
                                   __u64 start, __u64 end, __u64 *out)
 {
        struct rb_node *parent = NULL, **n;
@@ -853,7 +860,7 @@ static errcode_t rb_find_first_zero(ext2fs_generic_bitmap bitmap,
        return 0;
 }
 
-static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,
+static errcode_t rb_find_first_set(ext2fs_generic_bitmap_64 bitmap,
                                   __u64 start, __u64 end, __u64 *out)
 {
        struct rb_node *parent = NULL, **n;
@@ -902,7 +909,7 @@ static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,
 }
 
 #ifdef ENABLE_BMAP_STATS
-static void rb_print_stats(ext2fs_generic_bitmap bitmap)
+static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap)
 {
        struct ext2fs_rb_private *bp;
        struct rb_node *node = NULL;
@@ -949,21 +956,23 @@ static void rb_print_stats(ext2fs_generic_bitmap bitmap)
                bp->test_hit, t_hit, bp->mark_hit, m_hit);
 #endif
        fprintf(stderr, "%16llu extents (%llu bytes)\n",
-               count, ((count * sizeof(struct bmap_rb_extent)) +
-                       sizeof(struct ext2fs_rb_private)));
+               (unsigned long long) count, (unsigned long long)
+               ((count * sizeof(struct bmap_rb_extent)) +
+                sizeof(struct ext2fs_rb_private)));
        fprintf(stderr, "%16llu bits minimum size\n",
-               min_size);
+               (unsigned long long) min_size);
        fprintf(stderr, "%16llu bits maximum size\n"
                "%16llu bits average size\n",
-               max_size, avg_size);
-       fprintf(stderr, "%16llu bits set in bitmap (out of %llu)\n", size,
-               bitmap->real_end - bitmap->start);
+               (unsigned long long) max_size, (unsigned long long) avg_size);
+       fprintf(stderr, "%16llu bits set in bitmap (out of %llu)\n",
+               (unsigned long long) size,
+               (unsigned long long) bitmap->real_end - bitmap->start);
        fprintf(stderr,
                "%16.4lf memory / bitmap bit memory ratio (bitarray = 1)\n",
                eff);
 }
 #else
-static void rb_print_stats(ext2fs_generic_bitmap bitmap EXT2FS_ATTR((unused)))
+static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap EXT2FS_ATTR((unused)))
 {
 }
 #endif