From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 May 2017 18:40:34 +0000 (-0700)
Subject: Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: v4.12-rc1~72
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=677375cef8cb7763ef620e007873117b9bad72a0;p=linux.git

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

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
---

677375cef8cb7763ef620e007873117b9bad72a0
diff --cc fs/ext4/namei.c
index 6577a3c45815,4d9b587507d9..b81f7d46f344
--- a/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;