summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-11-12 16:39:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-11-12 16:39:58 -0800
commit585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba (patch)
treebbeeca2af139c0a22fc5e0f0d437c6422ce5a89c /fs
parent20ca21dfccb6dd6ae4d1d22b91c3c7514f4a712c (diff)
parentd19d8d345eecd9247cbe6cbf27aef271bd88aba7 (diff)
downloadlinux-585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba.tar.bz2
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
Diffstat (limited to 'fs')
-rw-r--r--fs/crypto/inline_crypt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c
index 89bffa82ed74..c57bebfa48fe 100644
--- a/fs/crypto/inline_crypt.c
+++ b/fs/crypto/inline_crypt.c
@@ -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 */