Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[karo-tx-linux.git] / fs / jbd / journal.c

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 81cc7eaff86321c2788c0aa83c236778e6fb4b70..6510d6355729c021b79afe88adbff86c96a2112f 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -310,8 +310,6 @@ int journal_write_metadata_buffer(transaction_t *transaction,
 
        new_bh = alloc_buffer_head(GFP_NOFS|__GFP_NOFAIL);
        /* keep subsequent assertions sane */
-       new_bh->b_state = 0;
-       init_buffer(new_bh, NULL, NULL);
        atomic_set(&new_bh->b_count, 1);
        new_jh = journal_add_journal_head(new_bh);      /* This sleeps */
 
@@ -564,6 +562,16 @@ int log_wait_commit(journal_t *journal, tid_t tid)
        spin_unlock(&journal->j_state_lock);
 #endif
        spin_lock(&journal->j_state_lock);
+       /*
+        * Not running or committing trans? Must be already committed. This
+        * saves us from waiting for a *long* time when tid overflows.
+        */
+       if (!((journal->j_running_transaction &&
+              journal->j_running_transaction->t_tid == tid) ||
+             (journal->j_committing_transaction &&
+              journal->j_committing_transaction->t_tid == tid)))
+               goto out_unlock;
+
        if (!tid_geq(journal->j_commit_waited, tid))
                journal->j_commit_waited = tid;
        while (tid_gt(tid, journal->j_commit_sequence)) {
@@ -575,6 +583,7 @@ int log_wait_commit(journal_t *journal, tid_t tid)
                                !tid_gt(tid, journal->j_commit_sequence));
                spin_lock(&journal->j_state_lock);
        }
+out_unlock:
        spin_unlock(&journal->j_state_lock);
 
        if (unlikely(is_journal_aborted(journal))) {
@@ -1845,7 +1854,7 @@ static struct journal_head *journal_alloc_journal_head(void)
 #ifdef CONFIG_JBD_DEBUG
        atomic_inc(&nr_journal_heads);
 #endif
-       ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);
+       ret = kmem_cache_zalloc(journal_head_cache, GFP_NOFS);
        if (ret == NULL) {
                jbd_debug(1, "out of memory for journal_head\n");
                printk_ratelimited(KERN_NOTICE "ENOMEM in %s, retrying.\n",
@@ -1853,7 +1862,7 @@ static struct journal_head *journal_alloc_journal_head(void)
 
                while (ret == NULL) {
                        yield();
-                       ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);
+                       ret = kmem_cache_zalloc(journal_head_cache, GFP_NOFS);
                }
        }
        return ret;
@@ -1915,10 +1924,8 @@ struct journal_head *journal_add_journal_head(struct buffer_head *bh)
        struct journal_head *new_jh = NULL;
 
 repeat:
-       if (!buffer_jbd(bh)) {
+       if (!buffer_jbd(bh))
                new_jh = journal_alloc_journal_head();
-               memset(new_jh, 0, sizeof(*new_jh));
-       }
 
        jbd_lock_bh_journal_head(bh);
        if (buffer_jbd(bh)) {