[PATCH 19/21 v5] e2fsck: check inline_data in pass3
From: Zheng Liu <hidden>
Date: 2012-09-22 03:51:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Zheng Liu <redacted> Signed-off-by: Zheng Liu <redacted> --- e2fsck/pass3.c | 8 ++++++++ e2fsck/rehash.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index a379e9b..85b3f65 100644
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c@@ -787,6 +787,14 @@ errcode_t e2fsck_expand_directory(e2fsck_t ctx, ext2_ino_t dir, es.ctx = ctx; es.dir = dir; + if (ext2fs_inode_has_inline_data(fs, dir)) { + retval = ext2fs_convert_inline_data(fs, dir, &es); + if (retval) + return retval; + + return 0; + } + retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_APPEND, 0, expand_dir_proc, &es);
diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
index 347f1b0..a54c6b4 100644
--- a/e2fsck/rehash.c
+++ b/e2fsck/rehash.c@@ -940,7 +940,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx) #if 0 fix_problem(ctx, PR_3A_OPTIMIZE_DIR, &pctx); #endif - pctx.errcode = e2fsck_rehash_dir(ctx, ino); + if (!ext2fs_inode_has_inline_data(ctx->fs, ino)) + pctx.errcode = e2fsck_rehash_dir(ctx, ino); if (pctx.errcode) { end_problem_latch(ctx, PR_LATCH_OPTIMIZE_DIR); fix_problem(ctx, PR_3A_OPTIMIZE_DIR_ERR, &pctx);
--
1.7.4.1