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

1 files changed, 2 insertions, 1 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;