libceph: uninline ceph_crypto_key_destroy()

idryomov · idryomov · commit 6db2304aabb0 · 2016-12-12T23:09:20.000+01:00
Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
Reviewed-by: Sage Weil &lt;sage@redhat.com&gt;
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,14 @@ int ceph_crypto_key_unarmor(struct ceph_crypto_key key, const char inkey)`
`80`	`80`	`return 0;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+void ceph_crypto_key_destroy(struct ceph_crypto_key *key)`
	`84`	`+{`
	`85`	`+ if (key) {`
	`86`	`+ kfree(key->key);`
	`87`	`+ key->key = NULL;`
	`88`	`+ }`
	`89`	`+}`
	`90`	`+`
`83`	`91`	`static struct crypto_skcipher *ceph_crypto_alloc_cipher(void)`
`84`	`92`	`{`
`85`	`93`	`return crypto_alloc_skcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);`