From 04b0d860e5c263183aef86e19fb0bdb2f9ffba82 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Tue, 16 Oct 2007 18:38:25 -0400 Subject: [PATCH] --- yaml --- r: 71074 b: refs/heads/master c: a7fa2baf8e2a6c0eb0a21f75e919c226179e8ff4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd2/commit.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d4d4095e3a48..5c468d17b70e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd02ff0b14b7e27cbdfd7ff2814b08199a2b7168 +refs/heads/master: a7fa2baf8e2a6c0eb0a21f75e919c226179e8ff4 diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index b898ee4ef16a..6986f334c643 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -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 @@ 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