diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-02 22:39:40 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-03 17:53:32 +0800 |
| commit | 0cec2ad45f07c308b03337b34a02c691ed870f2c (patch) | |
| tree | 760991587269cd969ad797dceab76cae416d168b | |
| parent | 0c6ae139da9aad73445691476b989e6036c37a20 (diff) | |
| download | linux-crypto-0cec2ad45f07c308b03337b34a02c691ed870f2c.tar.gz linux-crypto-0cec2ad45f07c308b03337b34a02c691ed870f2c.zip | |
crypto: api - Change crypto_unregister_instance argument type
This patch makes crypto_unregister_instance take a crypto_instance
instead of a crypto_alg. This allows us to remove a duplicate
CRYPTO_ALG_INSTANCE check in crypto_unregister_instance.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/algapi.c | 8 | ||||
| -rw-r--r-- | crypto/crypto_user.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index 0f1976ec..f1d0307b 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -551,17 +551,13 @@ err: } EXPORT_SYMBOL_GPL(crypto_register_instance); -int crypto_unregister_instance(struct crypto_alg *alg) +int crypto_unregister_instance(struct crypto_instance *inst) { - struct crypto_instance *inst = (void *)alg; LIST_HEAD(list); - if (!(alg->cra_flags & CRYPTO_ALG_INSTANCE)) - return -EINVAL; - down_write(&crypto_alg_sem); - crypto_remove_spawns(alg, &list, NULL); + crypto_remove_spawns(&inst->alg, &list, NULL); crypto_remove_instance(inst, &list); up_write(&crypto_alg_sem); diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c index c5148a35..eab24972 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c @@ -316,7 +316,7 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh, if (atomic_read(&alg->cra_refcnt) != 1) return -EBUSY; - return crypto_unregister_instance(alg); + return crypto_unregister_instance((struct crypto_instance *)alg); } static struct crypto_alg *crypto_user_skcipher_alg(const char *name, u32 type, |