Commit a7fa2baf authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o

jbd2: fix commit code to properly abort journal

We should really call journal_abort() and not __journal_abort_hard() in
case of errors.  The latter call does not record the error in the journal
superblock and thus filesystem won't be marked as with errors later (and
user could happily mount it without any warning).
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent cd02ff0b
...@@ -475,7 +475,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) ...@@ -475,7 +475,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
if (err) if (err)
__jbd2_journal_abort_hard(journal); jbd2_journal_abort(journal, err);
jbd2_journal_write_revoke_records(journal, commit_transaction); jbd2_journal_write_revoke_records(journal, commit_transaction);
...@@ -533,7 +533,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) ...@@ -533,7 +533,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
descriptor = jbd2_journal_get_descriptor_buffer(journal); descriptor = jbd2_journal_get_descriptor_buffer(journal);
if (!descriptor) { if (!descriptor) {
__jbd2_journal_abort_hard(journal); jbd2_journal_abort(journal, -EIO);
continue; continue;
} }
...@@ -566,7 +566,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) ...@@ -566,7 +566,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
and repeat this loop: we'll fall into the and repeat this loop: we'll fall into the
refile-on-abort condition above. */ refile-on-abort condition above. */
if (err) { if (err) {
__jbd2_journal_abort_hard(journal); jbd2_journal_abort(journal, err);
continue; continue;
} }
...@@ -757,7 +757,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) ...@@ -757,7 +757,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
err = -EIO; err = -EIO;
if (err) if (err)
__jbd2_journal_abort_hard(journal); jbd2_journal_abort(journal, err);
/* End of a transaction! Finally, we can do checkpoint /* End of a transaction! Finally, we can do checkpoint
processing: any buffers committed as a result of this processing: any buffers committed as a result of this
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment