Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 fixes from Ted Ts'o:
 "Bug fixes (including a regression fix) for ext4"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix dcache lookup of !casefolded directories
  ext4: do not delete unlinked inode from orphan list on failed truncate
  ext4: wait for outstanding dio during truncate in nojournal mode
  ext4: don't perform block validity checks on the journal inode

1 files changed, 8 insertions, 4 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index f2c62e2a0c98..d40ed940001e 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -518,10 +518,14 @@ __read_extent_tree_block(const char *function, unsigned int line,
         }
         if (buffer_verified(bh) && !(flags & EXT4_EX_FORCE_CACHE))
                 return bh;
-        err = __ext4_ext_check(function, line, inode,
-                               ext_block_hdr(bh), depth, pblk);
-        if (err)
-                goto errout;
+        if (!ext4_has_feature_journal(inode->i_sb) ||
+            (inode->i_ino !=
+             le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_journal_inum))) {
+                err = __ext4_ext_check(function, line, inode,
+                                       ext_block_hdr(bh), depth, pblk);
+                if (err)
+                        goto errout;
+        }
         set_buffer_verified(bh);
         /*
          * If this is a leaf block, cache all of its entries