|
@@ -466,7 +466,7 @@ void journal_commit_transaction(journal_t *journal)
|
|
spin_unlock(&journal->j_list_lock);
|
|
spin_unlock(&journal->j_list_lock);
|
|
|
|
|
|
if (err)
|
|
if (err)
|
|
- __journal_abort_hard(journal);
|
|
|
|
|
|
+ journal_abort(journal, err);
|
|
|
|
|
|
journal_write_revoke_records(journal, commit_transaction);
|
|
journal_write_revoke_records(journal, commit_transaction);
|
|
|
|
|
|
@@ -524,7 +524,7 @@ void journal_commit_transaction(journal_t *journal)
|
|
|
|
|
|
descriptor = journal_get_descriptor_buffer(journal);
|
|
descriptor = journal_get_descriptor_buffer(journal);
|
|
if (!descriptor) {
|
|
if (!descriptor) {
|
|
- __journal_abort_hard(journal);
|
|
|
|
|
|
+ journal_abort(journal, -EIO);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -557,7 +557,7 @@ void 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) {
|
|
- __journal_abort_hard(journal);
|
|
|
|
|
|
+ journal_abort(journal, err);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -748,7 +748,7 @@ wait_for_iobuf:
|
|
err = -EIO;
|
|
err = -EIO;
|
|
|
|
|
|
if (err)
|
|
if (err)
|
|
- __journal_abort_hard(journal);
|
|
|
|
|
|
+ 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
|