-
Notifications
You must be signed in to change notification settings - Fork 2
/
e2fsck-check-inline_data-in-pass3
47 lines (41 loc) · 1.29 KB
/
e2fsck-check-inline_data-in-pass3
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
e2fsck: check inline_data in pass3
From: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
e2fsck/pass3.c | 8 ++++++++
e2fsck/rehash.c | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
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 9cfb516..53145ba 100644
--- a/e2fsck/rehash.c
+++ b/e2fsck/rehash.c
@@ -939,7 +939,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.12.rc0.22.gcdd159b