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

4 files changed, 17 insertions, 8 deletions

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index d512c4bc4ad7..d706dbfa6220 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -218,7 +218,8 @@ void ext3_evict_inode (struct inode *inode)
          */
         if (inode->i_nlink && ext3_should_journal_data(inode) &&
             EXT3_SB(inode->i_sb)->s_journal &&
-            (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) {
+            (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) &&
+            inode->i_ino != EXT3_JOURNAL_INO) {
                 tid_t commit_tid = atomic_read(&ei->i_datasync_tid);
                 journal_t *journal = EXT3_SB(inode->i_sb)->s_journal;
 
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 865c4308acb6..6510d6355729 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -562,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)) {
@@ -573,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))) {
@@ -1843,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",
@@ -1851,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;
@@ -1913,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)) {
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 071d6905f0dd..e3e255c0a509 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -245,7 +245,6 @@ static handle_t *new_handle(int nblocks)
         handle_t *handle = jbd_alloc_handle(GFP_NOFS);
         if (!handle)
                 return NULL;
-        memset(handle, 0, sizeof(*handle));
         handle->h_buffer_credits = nblocks;
         handle->h_ref = 1;
 
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index c8f32975f0e4..7e0b622503c4 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -887,7 +887,7 @@ extern struct kmem_cache *jbd_handle_cache;
 
 static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
 {
-        return kmem_cache_alloc(jbd_handle_cache, gfp_flags);
+        return kmem_cache_zalloc(jbd_handle_cache, gfp_flags);
 }
 
 static inline void jbd_free_handle(handle_t *handle)