From: Wang Shilong <wshilong@ddn.com>
Date: Mon, 21 Sep 2020 11:02:33 +0000 (+0800)
Subject: e2fsck: rbtree bitmap for dir
X-Git-Tag: v1.47.1-wc1~82
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2ac656b6c7d468f317aee43aa6f145450551fd42;p=tools%2Fe2fsprogs.git

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 f83fe60..4ca91f8 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1290,6 +1290,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) {