diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2023-01-27 12:42:47 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-01-27 12:42:47 -0500 |
| commit | 8f4f9f0ec5bd53973043bced10e57b471db32632 (patch) | |
| tree | 77b0d63c1ef23c9730c2c67a685534e5bc8cc2a1 /e2fsck/journal.c | |
| parent | d37a9f1818fa04fc91a497b3541ed205804720af (diff) | |
| parent | 9fd9c75204c5c1c021fa9911b787e62e9657802e (diff) | |
| download | e2fsprogs-8f4f9f0ec5bd53973043bced10e57b471db32632.tar.gz | |
Merge branch 'maint' into next
Diffstat (limited to 'e2fsck/journal.c')
| -rw-r--r-- | e2fsck/journal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/e2fsck/journal.c b/e2fsck/journal.c index d802c5e9..c7868d89 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -888,7 +888,7 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, /* * Mark the file system to indicate it contains errors. That's * because the updates performed by fast commit replay code are - * not atomic and may result in incosistent file system if it + * not atomic and may result in inconsistent file system if it * crashes before the replay is complete. */ ctx->fs->super->s_state |= EXT2_ERROR_FS; @@ -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; } |