diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-12-02 16:35:08 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-12-12 23:09:20 +0100 |
| commit | 6db2304aabb070261ad34923bfd83c43dfb000e3 (patch) | |
| tree | 676ae16b17bcbceccaa51e4b094c9f568988fb4a /net | |
| parent | libceph: remove now unused ceph_*{en,de}crypt*() functions (diff) | |
| download | linux-6db2304aabb070261ad34923bfd83c43dfb000e3.tar.xz linux-6db2304aabb070261ad34923bfd83c43dfb000e3.zip | |
libceph: uninline ceph_crypto_key_destroy()
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/crypto.c | 8 | ||||
| -rw-r--r-- | net/ceph/crypto.h | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c index 38936e1fd644..c4d8f68e0b18 100644 --- a/net/ceph/crypto.c +++ b/net/ceph/crypto.c @@ -80,6 +80,14 @@ int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *inkey) return 0; } +void ceph_crypto_key_destroy(struct ceph_crypto_key *key) +{ + if (key) { + kfree(key->key); + key->key = NULL; + } +} + static struct crypto_skcipher *ceph_crypto_alloc_cipher(void) { return crypto_alloc_skcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC); diff --git a/net/ceph/crypto.h b/net/ceph/crypto.h index c33bcafd3829..c4211590b721 100644 --- a/net/ceph/crypto.h +++ b/net/ceph/crypto.h @@ -14,19 +14,12 @@ struct ceph_crypto_key { void *key; }; -static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key) -{ - if (key) { - kfree(key->key); - key->key = NULL; - } -} - int ceph_crypto_key_clone(struct ceph_crypto_key *dst, const struct ceph_crypto_key *src); int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end); int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end); int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in); +void ceph_crypto_key_destroy(struct ceph_crypto_key *key); /* crypto.c */ int ceph_crypt(const struct ceph_crypto_key *key, bool encrypt, |