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

Pull ext4 updates from Ted Ts'o:
 "Lots of bug fixes and cleanups"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
  ext4: remove unused variable
  ext4: use journal inode to determine journal overhead
  ext4: create function to read journal inode
  ext4: unmap metadata when zeroing blocks
  ext4: remove plugging from ext4_file_write_iter()
  ext4: allow unlocked direct IO when pages are cached
  ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY
  fscrypto: use standard macros to compute length of fname ciphertext
  ext4: do not unnecessarily null-terminate encrypted symlink data
  ext4: release bh in make_indexed_dir
  ext4: Allow parallel DIO reads
  ext4: allow DAX writeback for hole punch
  jbd2: fix lockdep annotation in add_transaction_credits()
  blockgroup_lock.h: simplify definition of NR_BG_LOCKS
  blockgroup_lock.h: remove debris from bgl_lock_ptr() conversion
  fscrypto: make filename crypto functions return 0 on success
  fscrypto: rename completion callbacks to reflect usage
  fscrypto: remove unnecessary includes
  fscrypto: improved validation when loading inode encryption metadata
  ext4: fix memory leak when symlink decryption fails
  ...

diff --cc fs/ext4/ioctl.c
Simple merge

diff --cc fs/f2fs/dir.c
index cbf85f6,8716943..12b5836
--- 1/fs/f2fs/dir.c
--- 2/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@@ -813,12 -786,19 +813,12 @@@ bool f2fs_fill_dentries(struct dir_cont
  
                if (f2fs_encrypted_inode(d->inode)) {
                        int save_len = fstr->len;
-                       int ret;
+                       int err;
  
-                       ret = fscrypt_fname_disk_to_usr(d->inode,
 -                      de_name.name = f2fs_kmalloc(de_name.len, GFP_NOFS);
 -                      if (!de_name.name)
 -                              return false;
 -
 -                      memcpy(de_name.name, d->filename[bit_pos], de_name.len);
 -
+                       err = fscrypt_fname_disk_to_usr(d->inode,
                                                (u32)de->hash_code, 0,
                                                &de_name, fstr);
-                       if (ret < 0)
 -                      kfree(de_name.name);
+                       if (err)
                                return true;
  
                        de_name = *fstr;

diff --cc fs/f2fs/namei.c
Simple merge

diff --cc include/linux/fscrypto.h
Simple merge