From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 11 Oct 2012 11:38:01 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~413
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=3a4fd4c84d5bab959c85a6ccbfcb9715c3d9fd5e;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	lib/ext2fs/blkmap64_rb.c
---

3a4fd4c84d5bab959c85a6ccbfcb9715c3d9fd5e
diff --cc lib/ext2fs/blkmap64_rb.c
index 74140ec,a42eda1..a075274
--- a/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;