Skip to content

Commit

Permalink
jbd2: fix commit code to properly abort journal
Browse files Browse the repository at this point in the history
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: Jan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Jan Kara authored and Theodore Ts'o committed Oct 17, 2007
1 parent cd02ff0 commit a7fa2ba
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/jbd2/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
spin_unlock(&journal->j_list_lock);

if (err)
__jbd2_journal_abort_hard(journal);
jbd2_journal_abort(journal, err);

jbd2_journal_write_revoke_records(journal, commit_transaction);

Expand Down Expand Up @@ -533,7 +533,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)

descriptor = jbd2_journal_get_descriptor_buffer(journal);
if (!descriptor) {
__jbd2_journal_abort_hard(journal);
jbd2_journal_abort(journal, -EIO);
continue;
}

Expand Down Expand Up @@ -566,7 +566,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
and repeat this loop: we'll fall into the
refile-on-abort condition above. */
if (err) {
__jbd2_journal_abort_hard(journal);
jbd2_journal_abort(journal, err);
continue;
}

Expand Down Expand Up @@ -757,7 +757,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
err = -EIO;

if (err)
__jbd2_journal_abort_hard(journal);
jbd2_journal_abort(journal, err);

/* End of a transaction! Finally, we can do checkpoint
processing: any buffers committed as a result of this
Expand Down

0 comments on commit a7fa2ba

Please sign in to comment.