Merge branch 'old-maint' into maint

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

diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c
index 07d6b4897cf300c65b4217a284b725100fc9c655..1fd552745b02abd9c19c670f55d565cdbf91b06a 100644 (file)
--- a/lib/ext2fs/blkmap64_rb.c
+++ b/lib/ext2fs/blkmap64_rb.c
@@ -9,6 +9,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -22,6 +23,9 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#if HAVE_LINUX_TYPES_H
+#include <linux/types.h>
+#endif
 
 #include "ext2_fs.h"
 #include "ext2fsP.h"
@@ -41,7 +45,7 @@ struct ext2fs_rb_private {
        struct bmap_rb_extent *wcursor;
        struct bmap_rb_extent *rcursor;
        struct bmap_rb_extent *rcursor_next;
-#ifdef BMAP_STATS_OPS
+#ifdef ENABLE_BMAP_STATS_OPS
        __u64 mark_hit;
        __u64 test_hit;
 #endif
@@ -70,15 +74,15 @@ static void print_tree(struct rb_root *root)
        struct rb_node *node = NULL;
        struct bmap_rb_extent *ext;
 
-       printf("\t\t\t=================================\n");
+       fprintf(stderr, "\t\t\t=================================\n");
        node = ext2fs_rb_first(root);
        for (node = ext2fs_rb_first(root); node != NULL; 
             node = ext2fs_rb_next(node)) {
                ext = node_to_extent(node);
-               printf("\t\t\t--> (%llu -> %llu)\n",
+               fprintf(stderr, "\t\t\t--> (%llu -> %llu)\n",
                        ext->start, ext->start + ext->count);
        }
-       printf("\t\t\t=================================\n");
+       fprintf(stderr, "\t\t\t=================================\n");
 }
 
 static void check_tree(struct rb_root *root, const char *msg)
@@ -90,35 +94,41 @@ static void check_tree(struct rb_root *root, const char *msg)
             node = ext2fs_rb_next(node)) {
                ext = node_to_extent(node);
                if (ext->count == 0) {
-                       printf("Tree Error: count is zero\n");
-                       printf("extent: %llu -> %llu (%llu)\n", ext->start,
-                               ext->start + ext->count, ext->count);
+                       fprintf(stderr, "Tree Error: count is zero\n");
+                       fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
+                               ext->start, ext->start + ext->count,
+                               ext->count);
                        goto err_out;
                }
                if (ext->start + ext->count < ext->start) {
-                       printf("Tree Error: start or count is crazy\n");
-                       printf("extent: %llu -> %llu (%llu)\n", ext->start,
-                               ext->start + ext->count, ext->count);
+                       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);
                        goto err_out;
                }
 
                if (old) {
                        if (old->start > ext->start) {
-                               printf("Tree Error: start is crazy\n");
-                               printf("extent: %llu -> %llu (%llu)\n",
+                               fprintf(stderr, "Tree Error: start is crazy\n");
+                               fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
                                        old->start, old->start + old->count,
                                        old->count);
-                               printf("extent next: %llu -> %llu (%llu)\n",
+                               fprintf(stderr,
+                                       "extent next: %llu -> %llu (%llu)\n",
                                        ext->start, ext->start + ext->count,
                                        ext->count);
                                goto err_out;
                        }
                        if ((old->start + old->count) >= ext->start) {
-                               printf("Tree Error: extent is crazy\n");
-                               printf("extent: %llu -> %llu (%llu)\n",
+                               fprintf(stderr,
+                                       "Tree Error: extent is crazy\n");
+                               fprintf(stderr, "extent: %llu -> %llu (%llu)\n",
                                        old->start, old->start + old->count,
                                        old->count);
-                               printf("extent next: %llu -> %llu (%llu)\n",
+                               fprintf(stderr,
+                                       "extent next: %llu -> %llu (%llu)\n",
                                        ext->start, ext->start + ext->count,
                                        ext->count);
                                goto err_out;
@@ -129,7 +139,7 @@ static void check_tree(struct rb_root *root, const char *msg)
        return;
 
 err_out:
-       printf("%s\n", msg);
+       fprintf(stderr, "%s\n", msg);
        print_tree(root);
        exit(1);
 }
@@ -146,10 +156,8 @@ static void rb_get_new_extent(struct bmap_rb_extent **ext, __u64 start,
 
        retval = ext2fs_get_mem(sizeof (struct bmap_rb_extent),
                                &new_ext);
-       if (retval) {
-               perror("ext2fs_get_mem");
-               exit(1);
-       }
+       if (retval)
+               abort();
 
        new_ext->start = start;
        new_ext->count = count;
@@ -169,7 +177,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;
@@ -183,7 +191,7 @@ static errcode_t rb_alloc_private_data (ext2fs_generic_bitmap bitmap)
        bp->rcursor_next = NULL;
        bp->wcursor = NULL;
 
-#ifdef BMAP_STATS_OPS
+#ifdef ENABLE_BMAP_STATS_OPS
        bp->test_hit = 0;
        bp->mark_hit = 0;
 #endif
@@ -193,7 +201,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;
 
@@ -217,7 +225,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;
 
@@ -228,8 +236,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;
@@ -294,7 +302,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;
@@ -329,7 +337,7 @@ rb_test_bit(struct ext2fs_rb_private *bp, __u64 bit)
                goto search_tree;
 
        if (bit >= rcursor->start && bit < rcursor->start + rcursor->count) {
-#ifdef BMAP_STATS_OPS
+#ifdef ENABLE_BMAP_STATS_OPS
                bp->test_hit++;
 #endif
                return 1;
@@ -389,12 +397,15 @@ static int rb_insert_extent(__u64 start, __u64 count,
        struct bmap_rb_extent *ext;
        int retval = 0;
 
+       if (count == 0)
+               return 0;
+
        bp->rcursor_next = NULL;
        ext = bp->wcursor;
        if (ext) {
                if (start >= ext->start &&
                    start <= (ext->start + ext->count)) {
-#ifdef BMAP_STATS_OPS
+#ifdef ENABLE_BMAP_STATS_OPS
                        bp->mark_hit++;
 #endif
                        goto got_extent;
@@ -553,7 +564,7 @@ static int rb_remove_extent(__u64 start, __u64 count,
                        retval = 1;
                        continue;
                } else {
-                       /* modify the last extent in reigon to be removed */
+                       /* modify the last extent in region to be removed */
                        ext->count -= ((start + count) - ext->start);
                        ext->start = start + count;
                        retval = 1;
@@ -564,7 +575,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;
@@ -577,7 +588,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;
@@ -592,7 +603,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;
 
@@ -602,7 +613,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;
@@ -614,7 +625,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;
@@ -626,7 +637,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;
@@ -682,7 +693,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;
@@ -728,15 +739,14 @@ 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)
 {
 
        struct rb_node *parent = NULL, *next, **n;
        struct ext2fs_rb_private *bp;
        struct bmap_rb_extent *ext;
-       int count;
-       __u64 pos;
+       __u64 count, pos;
 
        bp = (struct ext2fs_rb_private *) bitmap->private;
        n = &bp->root.rb_node;
@@ -767,9 +777,9 @@ static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,
                if (pos >= start + num)
                        break;
                if (pos < start) {
-                       count -= start - pos;
-                       if (count < 0)
+                       if (pos + count <  start)
                                continue;
+                       count -= start - pos;
                        pos = start;
                }
                if (pos + count > start + num)
@@ -794,7 +804,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;
 
@@ -807,7 +817,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;
@@ -843,7 +853,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;
@@ -891,8 +901,8 @@ static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,
        return ENOENT;
 }
 
-#ifdef BMAP_STATS
-static void rb_print_stats(ext2fs_generic_bitmap bitmap)
+#ifdef ENABLE_BMAP_STATS
+static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap)
 {
        struct ext2fs_rb_private *bp;
        struct rb_node *node = NULL;
@@ -902,7 +912,7 @@ static void rb_print_stats(ext2fs_generic_bitmap bitmap)
        __u64 min_size = ULONG_MAX;
        __u64 size = 0, avg_size = 0;
        double eff;
-#ifdef BMAP_STATS_OPS
+#ifdef ENABLE_BMAP_STATS_OPS
        __u64 mark_all, test_all;
        double m_hit = 0.0, t_hit = 0.0;
 #endif
@@ -926,7 +936,7 @@ static void rb_print_stats(ext2fs_generic_bitmap bitmap)
                min_size = 0;
        eff = (double)((count * sizeof(struct bmap_rb_extent)) << 3) /
              (bitmap->real_end - bitmap->start);
-#ifdef BMAP_STATS_OPS
+#ifdef ENABLE_BMAP_STATS_OPS
        mark_all = bitmap->stats.mark_count + bitmap->stats.mark_ext_count;
        test_all = bitmap->stats.test_count + bitmap->stats.test_ext_count;
        if (mark_all)
@@ -953,7 +963,9 @@ static void rb_print_stats(ext2fs_generic_bitmap bitmap)
                eff);
 }
 #else
-static void rb_print_stats(ext2fs_generic_bitmap bitmap){}
+static void rb_print_stats(ext2fs_generic_bitmap_64 bitmap EXT2FS_ATTR((unused)))
+{
+}
 #endif
 
 struct ext2_bitmap_ops ext2fs_blkmap64_rbtree = {