Public/Ext4Fsd
1
0
Fork 0
mirror of https://github.com/bobranten/Ext4Fsd.git synced 2025-10-30 05:18:31 -05:00
Code Activity

corrections for the checksum in the JBD2 journal superblock

Browse Source
This commit is contained in:
Bo Brantén
2021-02-01 19:07:23 +01:00
parent 2eee417130
commit c29808a8be
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Ext4Fsd/jbd2/journal.c
View File

@@ -144,7 +144,7 @@ static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb)
static int jbd2_superblock_csum_verify(journal_t *j, journal_superblock_t *sb) static int jbd2_superblock_csum_verify(journal_t *j, journal_superblock_t *sb)
{ {
if (!jbd2_journal_has_csum_v2or3(j)) if (!jbd2_journal_has_csum_v2or3_feature(j))
return 1; return 1;
return sb->s_checksum == jbd2_superblock_csum(j, sb); return sb->s_checksum == jbd2_superblock_csum(j, sb);
@@ -152,7 +152,7 @@ static int jbd2_superblock_csum_verify(journal_t *j, journal_superblock_t *sb)
static void jbd2_superblock_csum_set(journal_t *j, journal_superblock_t *sb) static void jbd2_superblock_csum_set(journal_t *j, journal_superblock_t *sb)
{ {
if (!jbd2_journal_has_csum_v2or3(j)) if (!jbd2_journal_has_csum_v2or3_feature(j))
return; return;
sb->s_checksum = jbd2_superblock_csum(j, sb); sb->s_checksum = jbd2_superblock_csum(j, sb);
@@ -1609,6 +1609,7 @@ static int journal_get_superblock(journal_t *journal)
/* Check superblock checksum */ /* Check superblock checksum */
if (!jbd2_superblock_csum_verify(journal, sb)) { if (!jbd2_superblock_csum_verify(journal, sb)) {
printk(KERN_ERR "JBD2: journal checksum error\n"); printk(KERN_ERR "JBD2: journal checksum error\n");
DbgPrint("JBD2: journal checksum error\n");
err = -EFSBADCRC; err = -EFSBADCRC;
goto out; goto out;
} }
@@ -1767,21 +1768,19 @@ int jbd2_journal_destroy(journal_t *journal)
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
#endif #endif
if (journal->j_sb_buffer) { if (journal->j_sb_buffer) {
#if 0
if (!is_journal_aborted(journal)) { if (!is_journal_aborted(journal)) {
mutex_lock_io(&journal->j_checkpoint_mutex); //mutex_lock_io(&journal->j_checkpoint_mutex);
write_lock(&journal->j_state_lock); //write_lock(&journal->j_state_lock);
journal->j_tail_sequence = journal->j_tail_sequence =
++journal->j_transaction_sequence; ++journal->j_transaction_sequence;
write_unlock(&journal->j_state_lock); //write_unlock(&journal->j_state_lock);
jbd2_mark_journal_empty(journal, jbd2_mark_journal_empty(journal,
REQ_SYNC | REQ_PREFLUSH | REQ_FUA); 0/*REQ_SYNC | REQ_PREFLUSH | REQ_FUA*/);
mutex_unlock(&journal->j_checkpoint_mutex); //mutex_unlock(&journal->j_checkpoint_mutex);
} else } else
err = -EIO; err = -EIO;
#endif
brelse(journal->j_sb_buffer); brelse(journal->j_sb_buffer);
} }