X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fjbd%2Fcommit.c;fp=fs%2Fjbd%2Fcommit.c;h=8f1f2aa5fb39b2df5b744c2f7e495145cf1b2df8;hb=7a266e75cf5a1efd20d084408a1b7f1a185496dd;hp=a263d82761dfdc3fcf63be7900ed47a803b9b3b2;hpb=c2a9159cdd8b334a0dfaf69d8b07cd57b5272baa;p=linux-2.6-omap-h63xx.git

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index a263d82761d..8f1f2aa5fb3 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -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);
 
@@ -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;
 			}
 
@@ -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;
 		}
 
@@ -748,7 +748,7 @@ wait_for_iobuf:
 		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