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

Pull ext3/jbd fixes from Jan Kara:
 "A couple of ext3/jbd fixes"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  jbd: use kmem_cache_zalloc for allocating journal head
  jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  jbd: don't wait (forever) for stale tid caused by wraparound
  ext3: fix data=journal fast mount/umount hang

diff --combined fs/jbd/journal.c
index 865c4308acb67d64b044a66776e17071d8c6b53f,726a4432cbb15a05f8758f9bcf99e8d74170f569..6510d6355729c021b79afe88adbff86c96a2112f
--- 1/fs/jbd/journal.c
--- 2/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@@ -310,6 -310,8 +310,6 @@@ int journal_write_metadata_buffer(trans
  
        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 */
  
@@@ -562,6 -564,16 +562,16 @@@ int log_wait_commit(journal_t *journal
        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)) {
@@@ -573,6 -585,7 +583,7 @@@
                                !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))) {
@@@ -1843,7 -1856,7 +1854,7 @@@ static struct journal_head *journal_all
  #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",
@@@ -1851,7 -1864,7 +1862,7 @@@
  
                while (ret == NULL) {
                        yield();
-                       ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);
+                       ret = kmem_cache_zalloc(journal_head_cache, GFP_NOFS);
                }
        }
        return ret;
@@@ -1913,10 -1926,8 +1924,8 @@@ struct journal_head *journal_add_journa
        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)) {