io-wq: wait for worker startup when forking a new one

[linux-2.6-microblaze.git] / fs / crypto / keysetup_v1.c

diff --git a/fs/crypto/keysetup_v1.c b/fs/crypto/keysetup_v1.c
index a3cb525..2762c53 100644 (file)
--- a/fs/crypto/keysetup_v1.c
+++ b/fs/crypto/keysetup_v1.c
@@ -60,7 +60,7 @@ static int derive_key_aes(const u8 *master_key,
                goto out;
        }
        crypto_skcipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);
-       req = skcipher_request_alloc(tfm, GFP_NOFS);
+       req = skcipher_request_alloc(tfm, GFP_KERNEL);
        if (!req) {
                res = -ENOMEM;
                goto out;
@@ -99,7 +99,7 @@ find_and_lock_process_key(const char *prefix,
        const struct user_key_payload *ukp;
        const struct fscrypt_key *payload;
 
-       description = kasprintf(GFP_NOFS, "%s%*phN", prefix,
+       description = kasprintf(GFP_KERNEL, "%s%*phN", prefix,
                                FSCRYPT_KEY_DESCRIPTOR_SIZE, descriptor);
        if (!description)
                return ERR_PTR(-ENOMEM);
@@ -228,7 +228,7 @@ fscrypt_get_direct_key(const struct fscrypt_info *ci, const u8 *raw_key)
                return dk;
 
        /* Nope, allocate one. */
-       dk = kzalloc(sizeof(*dk), GFP_NOFS);
+       dk = kzalloc(sizeof(*dk), GFP_KERNEL);
        if (!dk)
                return ERR_PTR(-ENOMEM);
        refcount_set(&dk->dk_refcount, 1);
@@ -272,7 +272,7 @@ static int setup_v1_file_key_derived(struct fscrypt_info *ci,
         * This cannot be a stack buffer because it will be passed to the
         * scatterlist crypto API during derive_key_aes().
         */
-       derived_key = kmalloc(ci->ci_mode->keysize, GFP_NOFS);
+       derived_key = kmalloc(ci->ci_mode->keysize, GFP_KERNEL);
        if (!derived_key)
                return -ENOMEM;