LU-8465 e2fsck: rbtree bitmap for dir

Only rbtree support merge operation now, use it for bitmaps.

Change-Id: I863687ce275f9c891cd2d18c115cb75c6e24f4e4
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-on: https://review.whamcloud.com/36020
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index e3b432a..3f4991c 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1440,6 +1440,7 @@ void e2fsck_pass1_run(e2fsck_t ctx)
        }
        pctx.errcode = e2fsck_allocate_inode_bitmap(fs,
                        _("directory inode map"),
+                       ctx->global_ctx ? EXT2FS_BMAP64_RBTREE :
                        EXT2FS_BMAP64_AUTODIR,
                        "inode_dir_map", &ctx->inode_dir_map);
        if (pctx.errcode) {