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

Pull fscrypt updates from Ted Ts'o:
 "Only bug fixes and cleanups for this merge window"

* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: correct collision claim for digested names
  MAINTAINERS: fscrypt: update mailing list, patchwork, and git
  ext4: clean up ext4_match() and callers
  f2fs: switch to using fscrypt_match_name()
  ext4: switch to using fscrypt_match_name()
  fscrypt: introduce helper function for filename matching
  fscrypt: avoid collisions when presenting long encrypted filenames
  f2fs: check entire encrypted bigname when finding a dentry
  ubifs: check for consistent encryption contexts in ubifs_lookup()
  f2fs: sync f2fs_lookup() with ext4_lookup()
  ext4: remove "nokey" check from ext4_lookup()
  fscrypt: fix context consistency check when key(s) unavailable
  fscrypt: Remove __packed from fscrypt_policy
  fscrypt: Move key structure and constants to uapi
  fscrypt: remove fscrypt_symlink_data_len()
  fscrypt: remove unnecessary checks for NULL operations

diff --cc MAINTAINERS
Simple merge

diff --cc fs/ext4/namei.c
index 6577a3c458151342771842357552a225bc9e0d16,4d9b587507d9941759403b461bbcf9e0c1e36a04..b81f7d46f344d482d4a7ab15a5cc1ad3654b3259
--- 1/fs/ext4/namei.c
--- 2/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@@ -1858,21 -1812,18 +1812,17 @@@ int ext4_find_dest_de(struct inode *dir
                de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
                offset += rlen;
        }
- 
        if ((char *) de > top)
-               res = -ENOSPC;
-       else {
-               *dest_de = de;
-               res = 0;
-       }
- return_result:
-       return res;
+               return -ENOSPC;
+ 
+       *dest_de = de;
+       return 0;
  }
  
 -int ext4_insert_dentry(struct inode *dir,
 -                     struct inode *inode,
 -                     struct ext4_dir_entry_2 *de,
 -                     int buf_size,
 -                     struct ext4_filename *fname)
 +void ext4_insert_dentry(struct inode *inode,
 +                      struct ext4_dir_entry_2 *de,
 +                      int buf_size,
 +                      struct ext4_filename *fname)
  {
  
        int nlen, rlen;

diff --cc fs/ubifs/dir.c
Simple merge