diff options
| -rw-r--r-- | fs/crypto/crypto.c | 7 | ||||
| -rw-r--r-- | fs/ext4/crypto_key.c | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index 5182c8e07..303e88123 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -410,11 +410,8 @@ int fscrypt_initialize(unsigned int cop_flags) { int i, res = -ENOMEM; - /* - * No need to allocate a bounce page pool if there already is one or - * this FS won't use it. - */ - if (cop_flags & FS_CFLG_OWN_PAGES || fscrypt_bounce_page_pool) + /* No need to allocate a bounce page pool if this FS won't use it. */ + if (cop_flags & FS_CFLG_OWN_PAGES) return 0; mutex_lock(&fscrypt_init_mutex); diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c index 84dccd223..bc36571b0 100644 --- a/fs/ext4/crypto_key.c +++ b/fs/ext4/crypto_key.c @@ -128,11 +128,9 @@ int _ext4_get_encryption_info(struct inode *inode) char mode; int res; - if (!ext4_read_workqueue) { - res = ext4_init_crypto(); - if (res) - return res; - } + res = ext4_init_crypto(); + if (res) + return res; retry: crypt_info = ACCESS_ONCE(ei->i_crypt_info); |