|
 |
3b974a |
From 06b155bff995fe13d68cc2829121d0d719e6fde7 Mon Sep 17 00:00:00 2001
|
|
|
3b974a |
From: Theodore Ts'o <tytso@mit.edu>
|
|
|
3b974a |
Date: Sat, 9 Aug 2014 12:31:04 -0400
|
|
|
3b974a |
Subject: [PATCH 1/5] e2fsck: fix file systems with an overly large
|
|
|
3b974a |
s_first_meta_bg
|
|
|
3b974a |
|
|
|
3b974a |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
3b974a |
---
|
|
|
3b974a |
e2fsck/problem.c | 5 +++++
|
|
|
3b974a |
e2fsck/problem.h | 3 +++
|
|
|
3b974a |
e2fsck/super.c | 12 ++++++++++++
|
|
|
3b974a |
3 files changed, 20 insertions(+)
|
|
|
3b974a |
|
|
|
3b974a |
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
|
|
|
3b974a |
index 2e41bb2e..6c7f514e 100644
|
|
|
3b974a |
--- a/e2fsck/problem.c
|
|
|
3b974a |
+++ b/e2fsck/problem.c
|
|
|
3b974a |
@@ -438,6 +438,11 @@ static struct e2fsck_problem problem_table[] = {
|
|
|
3b974a |
N_("@S 64bit filesystems needs extents to access the whole disk. "),
|
|
|
3b974a |
PROMPT_FIX, PR_PREEN_OK | PR_NO_OK},
|
|
|
3b974a |
|
|
|
3b974a |
+ /* The first_meta_bg is too big */
|
|
|
3b974a |
+ { PR_0_FIRST_META_BG_TOO_BIG,
|
|
|
3b974a |
+ N_("First_meta_bg is too big. (%N, max value %g). "),
|
|
|
3b974a |
+ PROMPT_CLEAR, 0 },
|
|
|
3b974a |
+
|
|
|
3b974a |
/* Meta_bg and resize_inode are not compatible, disable resize_inode*/
|
|
|
3b974a |
{ PR_0_DISABLE_RESIZE_INODE,
|
|
|
3b974a |
N_("Resize_@i and meta_bg features are enabled. Those features are\n"
|
|
|
3b974a |
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
|
|
|
3b974a |
index a591974e..2fc9be05 100644
|
|
|
3b974a |
--- a/e2fsck/problem.h
|
|
|
3b974a |
+++ b/e2fsck/problem.h
|
|
|
3b974a |
@@ -252,6 +252,9 @@ struct problem_context {
|
|
|
3b974a |
/* 64bit is set but extents are not set. */
|
|
|
3b974a |
#define PR_0_64BIT_WITHOUT_EXTENTS 0x000048
|
|
|
3b974a |
|
|
|
3b974a |
+/* The first_meta_bg is too big */
|
|
|
3b974a |
+#define PR_0_FIRST_META_BG_TOO_BIG 0x000049
|
|
|
3b974a |
+
|
|
|
3b974a |
/* Meta_bg and resize_inode are not compatible, remove resize_inode*/
|
|
|
3b974a |
#define PR_0_DISABLE_RESIZE_INODE 0x000051
|
|
|
3b974a |
|
|
|
3b974a |
diff --git a/e2fsck/super.c b/e2fsck/super.c
|
|
|
3b974a |
index 7e2c2e4f..7439d9d4 100644
|
|
|
3b974a |
--- a/e2fsck/super.c
|
|
|
3b974a |
+++ b/e2fsck/super.c
|
|
|
3b974a |
@@ -599,6 +599,18 @@ void check_super_block(e2fsck_t ctx)
|
|
|
3b974a |
ext2fs_mark_super_dirty(fs);
|
|
|
3b974a |
}
|
|
|
3b974a |
|
|
|
3b974a |
+ if ((fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&
|
|
|
3b974a |
+ (fs->super->s_first_meta_bg > fs->desc_blocks)) {
|
|
|
3b974a |
+ pctx.group = fs->desc_blocks;
|
|
|
3b974a |
+ pctx.num = fs->super->s_first_meta_bg;
|
|
|
3b974a |
+ if (fix_problem(ctx, PR_0_FIRST_META_BG_TOO_BIG, &pctx)) {
|
|
|
3b974a |
+ fs->super->s_feature_incompat &=
|
|
|
3b974a |
+ ~EXT2_FEATURE_INCOMPAT_META_BG;
|
|
|
3b974a |
+ fs->super->s_first_meta_bg = 0;
|
|
|
3b974a |
+ ext2fs_mark_super_dirty(fs);
|
|
|
3b974a |
+ }
|
|
|
3b974a |
+ }
|
|
|
3b974a |
+
|
|
|
3b974a |
/*
|
|
|
3b974a |
* Verify the group descriptors....
|
|
|
3b974a |
*/
|
|
|
3b974a |
--
|
|
|
3b974a |
2.21.3
|
|
|
3b974a |
|