diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-11-02 15:05:51 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-01-18 01:08:31 -0500 |
| commit | b0cd09e5b65373fc9f89048958c093bb1e6a1ecb (patch) | |
| tree | a82c35d6f67bdedd0c946da85ea8153c0826aba3 /e2fsck/journal.c | |
| parent | d08ef863feae14e4710bf2026404e6c6e06db2be (diff) | |
| download | e2fsprogs-b0cd09e5b65373fc9f89048958c093bb1e6a1ecb.tar.gz | |
e2fsck: don't allow journal inode to have encrypt flag
Since the kernel is being fixed to consider journal inodes with the
'encrypt' flag set to be invalid, also update e2fsck accordingly.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'e2fsck/journal.c')
| -rw-r--r-- | e2fsck/journal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 1646b479..1bfabb02 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -1039,7 +1039,8 @@ static errcode_t e2fsck_get_journal(e2fsck_t ctx, journal_t **ret_journal) tried_backup_jnl++; } if (!j_inode->i_ext2.i_links_count || - !LINUX_S_ISREG(j_inode->i_ext2.i_mode)) { + !LINUX_S_ISREG(j_inode->i_ext2.i_mode) || + (j_inode->i_ext2.i_flags & EXT4_ENCRYPT_FL)) { retval = EXT2_ET_NO_JOURNAL; goto try_backup_journal; } |