Merge branch 'maint' into next

Conflicts:
	lib/ext2fs/blkmap64_rb.c

diff --cc e2fsck/Makefile.in
Simple merge

diff --cc lib/ext2fs/blkmap64_rb.c
index 74140ecc658f4d5c2be0bc3179416ff38cd1ba03,a42eda1bb667c7eeed9c618871325510811a11d3..a0752747008ae207ccb424cd895121b0380c5081
--- 1/lib/ext2fs/blkmap64_rb.c
--- 2/lib/ext2fs/blkmap64_rb.c
+++ b/lib/ext2fs/blkmap64_rb.c
@@@ -38,9 -38,10 +38,10 @@@ struct bmap_rb_extent 
  
  struct ext2fs_rb_private {
        struct rb_root root;
-       struct bmap_rb_extent **wcursor;
-       struct bmap_rb_extent **rcursor;
+       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
@@@ -163,16 -168,11 +166,11 @@@ static errcode_t rb_alloc_private_data 
                return retval;
  
        bp->root = RB_ROOT;
-       retval = ext2fs_get_mem(sizeof(struct bmap_rb_extent *), &bp->rcursor);
-       if (retval)
-               return retval;
-       retval = ext2fs_get_mem(sizeof(struct bmap_rb_extent *), &bp->wcursor);
-       if (retval)
-               return retval;
-       *bp->rcursor = NULL;
-       *bp->wcursor = NULL;
+       bp->rcursor = NULL;
+       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
@@@ -731,11 -751,12 +749,12 @@@ static void rb_clear_bmap(ext2fs_generi
        bp = (struct ext2fs_rb_private *) bitmap->private;
  
        rb_free_tree(&bp->root);
-       *bp->rcursor = NULL;
-       *bp->wcursor = NULL;
+       bp->rcursor = NULL;
+       bp->rcursor_next = NULL;
+       bp->wcursor = NULL;
  }
  
 -#ifdef BMAP_STATS
 +#ifdef ENABLE_BMAP_STATS
  static void rb_print_stats(ext2fs_generic_bitmap bitmap)
  {
        struct ext2fs_rb_private *bp;