fs/fat: comment fix, fat_bits can be also 32

[linux-2.6-block.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 83b04e0884b10cb108f869164c52458a5e833447..d2627a3d4ed8b15cf53127b11daaad412a950711 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -64,6 +64,8 @@ static int crypto_check_alg(struct crypto_alg *alg)
        if (alg->cra_priority < 0)
                return -EINVAL;
 
+       atomic_set(&alg->cra_refcnt, 1);
+
        return crypto_set_driver_name(alg);
 }
 
@@ -99,10 +101,9 @@ static struct list_head *crypto_more_spawns(struct crypto_alg *alg,
        return &n->list == stack ? top : &n->inst->alg.cra_users;
 }
 
-static void crypto_remove_spawn(struct crypto_spawn *spawn,
-                               struct list_head *list)
+static void crypto_remove_instance(struct crypto_instance *inst,
+                                  struct list_head *list)
 {
-       struct crypto_instance *inst = spawn->inst;
        struct crypto_template *tmpl = inst->tmpl;
 
        if (crypto_is_dead(&inst->alg))
@@ -167,7 +168,7 @@ void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list,
                if (spawn->alg)
                        list_move(&spawn->list, &spawn->alg->cra_users);
                else
-                       crypto_remove_spawn(spawn, list);
+                       crypto_remove_instance(spawn->inst, list);
        }
 }
 EXPORT_SYMBOL_GPL(crypto_remove_spawns);
@@ -188,7 +189,6 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
 
        ret = -EEXIST;
 
-       atomic_set(&alg->cra_refcnt, 1);
        list_for_each_entry(q, &crypto_alg_list, cra_list) {
                if (q == alg)
                        goto err;
@@ -523,11 +523,14 @@ int crypto_register_instance(struct crypto_template *tmpl,
 
        err = crypto_check_alg(&inst->alg);
        if (err)
-               goto err;
+               return err;
 
        inst->alg.cra_module = tmpl->module;
        inst->alg.cra_flags |= CRYPTO_ALG_INSTANCE;
 
+       if (unlikely(!crypto_mod_get(&inst->alg)))
+               return -EAGAIN;
+
        down_write(&crypto_alg_sem);
 
        larval = __crypto_register_alg(&inst->alg);
@@ -545,37 +548,30 @@ unlock:
                goto err;
 
        crypto_wait_for_test(larval);
+
+       /* Remove instance if test failed */
+       if (!(inst->alg.cra_flags & CRYPTO_ALG_TESTED))
+               crypto_unregister_instance(inst);
        err = 0;
 
 err:
+       crypto_mod_put(&inst->alg);
        return err;
 }
 EXPORT_SYMBOL_GPL(crypto_register_instance);
 
-int crypto_unregister_instance(struct crypto_alg *alg)
+int crypto_unregister_instance(struct crypto_instance *inst)
 {
-       int err;
-       struct crypto_instance *inst = (void *)alg;
-       struct crypto_template *tmpl = inst->tmpl;
-       LIST_HEAD(users);
-
-       if (!(alg->cra_flags & CRYPTO_ALG_INSTANCE))
-               return -EINVAL;
-
-       BUG_ON(atomic_read(&alg->cra_refcnt) != 1);
+       LIST_HEAD(list);
 
        down_write(&crypto_alg_sem);
 
-       hlist_del_init(&inst->list);
-       err = crypto_remove_alg(alg, &users);
+       crypto_remove_spawns(&inst->alg, &list, NULL);
+       crypto_remove_instance(inst, &list);
 
        up_write(&crypto_alg_sem);
 
-       if (err)
-               return err;
-
-       tmpl->free(inst);
-       crypto_remove_final(&users);
+       crypto_remove_final(&list);
 
        return 0;
 }