e2fsck: rbtree bitmap for dir

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

E2fsprogs-commit: 9bab3284e30752bccc36be3e07b9ca4dfd218041

Change-Id: I42aeb009ece78a4baf4369aff3355fc9df51089a
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 367172d..3ee10d9 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1237,6 +1237,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) {