Commit 585e5b17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt 

Pull fscrypt fix from Eric Biggers:
 "Fix a regression where new files weren't using inline encryption when
  they should be"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: fix inline encryption not used on new files
parents 20ca21df d19d8d34

fs/crypto/inline_crypt.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int fscrypt_select_encryption_impl(struct fscrypt_info *ci) 
	int i;



	/* The file must need contents encryption, not filenames encryption */

	if (!fscrypt_needs_contents_encryption(inode))

	if (!S_ISREG(inode->i_mode))

		return 0;



	/* The crypto mode must have a blk-crypto counterpart */