2.6.24

 fs

 jbd2

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index c0f59d1..6986f33 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -278,7 +278,7 @@ static inline void write_tag_block(int tag_bytes, journal_block_tag_t *tag,
                unsigned long long block)
 {
    tag->t_blocknr = cpu_to_be32(block & (u32)~0);
-   if (tag_bytes > JBD_TAG_SIZE32)
+   if (tag_bytes > JBD2_TAG_SIZE32)
       tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1);
 }
 
@@ -384,7 +384,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
          struct buffer_head *bh = jh2bh(jh);
 
          jbd_lock_bh_state(bh);
-         jbd2_slab_free(jh->b_committed_data, bh->b_size);
+         jbd2_free(jh->b_committed_data, bh->b_size);
          jh->b_committed_data = NULL;
          jbd_unlock_bh_state(bh);
       }
@@ -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
@@ -801,14 +801,14 @@ restart_loop:
        * Otherwise, we can just throw away the frozen data now.
        */
       if (jh->b_committed_data) {
-         jbd2_slab_free(jh->b_committed_data, bh->b_size);
+         jbd2_free(jh->b_committed_data, bh->b_size);
          jh->b_committed_data = NULL;
          if (jh->b_frozen_data) {
             jh->b_committed_data = jh->b_frozen_data;
             jh->b_frozen_data = NULL;
          }
       } else if (jh->b_frozen_data) {
-         jbd2_slab_free(jh->b_frozen_data, bh->b_size);
+         jbd2_free(jh->b_frozen_data, bh->b_size);
          jh->b_frozen_data = NULL;
       }