summaryrefslogtreecommitdiff
path: root/e2fsck
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2008-03-13 23:13:18 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-03-13 23:13:18 -0400
commitee19c902e6f09ae058577f6b742d60692e7fb853 (patch)
tree93b8189c0817d12e964d5839997faf627a95c16a /e2fsck
parent7cadc57780f3e3e8e644e8976e11a336902d4a25 (diff)
downloade2fsprogs-ee19c902e6f09ae058577f6b742d60692e7fb853.tar.gz
e2fsck: Check for fast symlinks that have EXTENTS_FL set
These shouldn't show up in the wild, but if they do, e2fsck will offer to clear them. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'e2fsck')
-rw-r--r--e2fsck/pass1.c8
-rw-r--r--e2fsck/problem.c5
-rw-r--r--e2fsck/problem.h3
3 files changed, 16 insertions, 0 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 86389898..50e38e1f 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -713,6 +713,14 @@ void e2fsck_pass1(e2fsck_t ctx)
}
}
+ if (extent_fs && (inode->i_flags & EXT4_EXTENTS_FL) &&
+ LINUX_S_ISLNK(inode->i_mode) &&
+ !ext2fs_inode_has_valid_blocks(inode) &&
+ fix_problem(ctx, PR_1_FAST_SYMLINK_EXTENT_FL, &pctx)) {
+ inode->i_flags &= ~EXT4_EXTENTS_FL;
+ e2fsck_write_inode(ctx, ino, inode, "pass1");
+ }
+
if (ino == EXT2_BAD_INO) {
struct process_block_struct pb;
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index afed4fed..d3e2fd7b 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -819,6 +819,11 @@ static struct e2fsck_problem problem_table[] = {
N_("@i %i missing EXTENT_FL, but is in extents format\n"),
PROMPT_FIX, PR_PREEN_OK },
+ /* Fast symlink has EXTENTS_FL set */
+ { PR_1_FAST_SYMLINK_EXTENT_FL,
+ N_("Fast symlink %i has EXTENT_FL set. "),
+ PROMPT_CLEAR, 0 },
+
/* Pass 1b errors */
/* Pass 1B: Rescan for duplicate/bad blocks */
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index d5d1a783..48a4a2b6 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -476,6 +476,9 @@ struct problem_context {
/* inode missing EXTENTS_FL, but is an extent inode */
#define PR_1_UNSET_EXTENT_FL 0x01005C
+/* Fast symlink has EXTENTS_FL set */
+#define PR_1_FAST_SYMLINK_EXTENT_FL 0x01005D
+
/*
* Pass 1b errors
*/