summaryrefslogtreecommitdiffstats
path: root/fs/crypto/keyinfo.c
diff options
context:
space:
mode:
authorDavid Gstir <david@sigma-star.at>2016-12-06 23:53:57 +0100
committerTheodore Ts'o <tytso@mit.edu>2016-12-11 16:33:11 -0500
commitf32d7ac20a5864483c1f96e4970daa083e18bfd1 (patch)
treef381a5707d80076055bb23c14a5a2c134f3ae7df /fs/crypto/keyinfo.c
parentbd7b8290388dd58a8c0a3710b171e58ef952ca4d (diff)
downloadlinux-stable-f32d7ac20a5864483c1f96e4970daa083e18bfd1.tar.gz
linux-stable-f32d7ac20a5864483c1f96e4970daa083e18bfd1.tar.bz2
linux-stable-f32d7ac20a5864483c1f96e4970daa083e18bfd1.zip
fscrypt: Delay bounce page pool allocation until needed
Since fscrypt users can now indicated if fscrypt_encrypt_page() should use a bounce page, we can delay the bounce page pool initialization util it is really needed. That is until fscrypt_operations has no FS_CFLG_OWN_PAGES flag set. Signed-off-by: David Gstir <david@sigma-star.at> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto/keyinfo.c')
-rw-r--r--fs/crypto/keyinfo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index 35d3317a27b3..6eeea1dcba41 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -188,7 +188,7 @@ int fscrypt_get_crypt_info(struct inode *inode)
u8 *raw_key = NULL;
int res;
- res = fscrypt_initialize();
+ res = fscrypt_initialize(inode->i_sb->s_cop->flags);
if (res)
return res;