Skip to content

Commit

Permalink
jbd: 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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jan Kara authored and Linus Torvalds committed Oct 19, 2007
1 parent c2a9159 commit 7a266e7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/jbd/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ void journal_commit_transaction(journal_t *journal)
spin_unlock(&journal->j_list_lock);

if (err)
__journal_abort_hard(journal);
journal_abort(journal, err);

journal_write_revoke_records(journal, commit_transaction);

Expand Down Expand Up @@ -524,7 +524,7 @@ void journal_commit_transaction(journal_t *journal)

descriptor = journal_get_descriptor_buffer(journal);
if (!descriptor) {
__journal_abort_hard(journal);
journal_abort(journal, -EIO);
continue;
}

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

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

if (err)
__journal_abort_hard(journal);
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 7a266e7

Please sign in to comment.