Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jbd2: fix commit code to properly abort journal

Browse source 
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>
This commit is contained in:
Jan Kara 2007-10-16 18:38:25 -04:00 committed by Theodore Ts'o
parent cd02ff0b14
commit a7fa2baf8e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/jbd2/commit.c
View file

@ -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);
@ -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;
}
@ -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;
}
@ -757,7 +757,7 @@ wait_for_iobuf:
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