Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/kernel/stable.git] / fs / ubifs / auth.c

diff --git a/fs/ubifs/auth.c b/fs/ubifs/auth.c
index 3d049194afa44ddf7fa47c223156d00a0afa33b6..60f43b93d06e4b479fa2543f90619ffa841d0fe7 100644 (file)
--- a/fs/ubifs/auth.c
+++ b/fs/ubifs/auth.c
@@ -33,7 +33,6 @@ int __ubifs_node_calc_hash(const struct ubifs_info *c, const void *node,
        int err;
 
        shash->tfm = c->hash_tfm;
-       shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
        err = crypto_shash_digest(shash, node, le32_to_cpu(ch->len), hash);
        if (err < 0)
@@ -56,7 +55,6 @@ static int ubifs_hash_calc_hmac(const struct ubifs_info *c, const u8 *hash,
        int err;
 
        shash->tfm = c->hmac_tfm;
-       shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
        err = crypto_shash_digest(shash, hash, c->hash_len, hmac);
        if (err < 0)
@@ -90,7 +88,6 @@ int ubifs_prepare_auth_node(struct ubifs_info *c, void *node,
                SHASH_DESC_ON_STACK(hash_desc, c->hash_tfm);
 
                hash_desc->tfm = c->hash_tfm;
-               hash_desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
                ubifs_shash_copy_state(c, inhash, hash_desc);
 
                err = crypto_shash_final(hash_desc, hash);
@@ -126,7 +123,6 @@ static struct shash_desc *ubifs_get_desc(const struct ubifs_info *c,
                return ERR_PTR(-ENOMEM);
 
        desc->tfm = tfm;
-       desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
        err = crypto_shash_init(desc);
        if (err) {
@@ -349,7 +345,6 @@ static int ubifs_node_calc_hmac(const struct ubifs_info *c, const void *node,
        ubifs_assert(c, ofs_hmac + hmac_len < len);
 
        shash->tfm = c->hmac_tfm;
-       shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
        err = crypto_shash_init(shash);
        if (err)
@@ -468,7 +463,6 @@ int ubifs_hmac_wkm(struct ubifs_info *c, u8 *hmac)
                return 0;
 
        shash->tfm = c->hmac_tfm;
-       shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
        err = crypto_shash_init(shash);
        if (err)