crypto: algapi - fold crypto_init_spawn() into crypto_grab_spawn()

Now that crypto_init_spawn() is only called by crypto_grab_spawn(),
simplify things by moving its functionality into crypto_grab_spawn().

In the process of doing this, also be more consistent about when the
spawn and instance are updated, and remove the crypto_spawn::dropref
flag since now it's always set.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/algapi.c b/crypto/algapi.c
index f66a4ff57e6e7808485a20d5371cd0384f226838..72592795c7e71be38a0445ffb78b43f0c6eab126 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -629,8 +629,7 @@ int crypto_register_instance(struct crypto_template *tmpl,
                spawn->inst = inst;
                spawn->registered = true;
 
-               if (spawn->dropref)
-                       crypto_mod_put(spawn->alg);
+               crypto_mod_put(spawn->alg);
 
                spawn = next;
        }
@@ -672,47 +671,33 @@ void crypto_unregister_instance(struct crypto_instance *inst)
 }
 EXPORT_SYMBOL_GPL(crypto_unregister_instance);
 
-int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
-                     struct crypto_instance *inst, u32 mask)
+int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
+                     const char *name, u32 type, u32 mask)
 {
+       struct crypto_alg *alg;
        int err = -EAGAIN;
 
        if (WARN_ON_ONCE(inst == NULL))
                return -EINVAL;
 
-       spawn->next = inst->spawns;
-       inst->spawns = spawn;
+       /* Allow the result of crypto_attr_alg_name() to be passed directly */
+       if (IS_ERR(name))
+               return PTR_ERR(name);
 
-       spawn->mask = mask;
+       alg = crypto_find_alg(name, spawn->frontend, type, mask);
+       if (IS_ERR(alg))
+               return PTR_ERR(alg);
 
        down_write(&crypto_alg_sem);
        if (!crypto_is_moribund(alg)) {
                list_add(&spawn->list, &alg->cra_users);
                spawn->alg = alg;
+               spawn->mask = mask;
+               spawn->next = inst->spawns;
+               inst->spawns = spawn;
                err = 0;
        }
        up_write(&crypto_alg_sem);
-
-       return err;
-}
-EXPORT_SYMBOL_GPL(crypto_init_spawn);
-
-int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
-                     const char *name, u32 type, u32 mask)
-{
-       struct crypto_alg *alg;
-       int err;
-
-       /* Allow the result of crypto_attr_alg_name() to be passed directly */
-       if (IS_ERR(name))
-               return PTR_ERR(name);
-
-       alg = crypto_find_alg(name, spawn->frontend, type, mask);
-       if (IS_ERR(alg))
-               return PTR_ERR(alg);
-
-       spawn->dropref = true;
-       err = crypto_init_spawn(spawn, alg, inst, mask);
        if (err)
                crypto_mod_put(alg);
        return err;
@@ -729,7 +714,7 @@ void crypto_drop_spawn(struct crypto_spawn *spawn)
                list_del(&spawn->list);
        up_write(&crypto_alg_sem);
 
-       if (spawn->dropref && !spawn->registered)
+       if (!spawn->registered)
                crypto_mod_put(spawn->alg);
 }
 EXPORT_SYMBOL_GPL(crypto_drop_spawn);

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 224c72743ccecb4f0e8053bffc95889355d0f814..c16c50f8dac10e2fb99ce21bcbef4b40000a989f 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -82,7 +82,6 @@ struct crypto_spawn {
        const struct crypto_type *frontend;
        u32 mask;
        bool dead;
-       bool dropref;
        bool registered;
 };
 
@@ -111,8 +110,6 @@ int crypto_register_instance(struct crypto_template *tmpl,
                             struct crypto_instance *inst);
 void crypto_unregister_instance(struct crypto_instance *inst);
 
-int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
-                     struct crypto_instance *inst, u32 mask);
 int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
                      const char *name, u32 type, u32 mask);
 void crypto_drop_spawn(struct crypto_spawn *spawn);