lkml.org 
[lkml]   [2018]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/4] Rename 'free' functions
Date
From: Matthew Wilcox <mawilcox@microsoft.com>

The names of these static functions collide with a kernel-wide 'free'
function. Call them 'free_inst' instead.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
crypto/lrw.c | 4 ++--
crypto/xts.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/lrw.c b/crypto/lrw.c
index cbbd7c50ad19..2b93fc7f4e38 100644
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -522,7 +522,7 @@ static void exit_tfm(struct crypto_skcipher *tfm)
crypto_free_skcipher(ctx->child);
}

-static void free(struct skcipher_instance *inst)
+static void free_inst(struct skcipher_instance *inst)
{
crypto_drop_skcipher(skcipher_instance_ctx(inst));
kfree(inst);
@@ -634,7 +634,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.encrypt = encrypt;
inst->alg.decrypt = decrypt;

- inst->free = free;
+ inst->free = free_inst;

err = skcipher_register_instance(tmpl, inst);
if (err)
diff --git a/crypto/xts.c b/crypto/xts.c
index f317c48b5e43..5a7ac3dc2fd7 100644
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -465,7 +465,7 @@ static void exit_tfm(struct crypto_skcipher *tfm)
crypto_free_cipher(ctx->tweak);
}

-static void free(struct skcipher_instance *inst)
+static void free_inst(struct skcipher_instance *inst)
{
crypto_drop_skcipher(skcipher_instance_ctx(inst));
kfree(inst);
@@ -576,7 +576,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb)
inst->alg.encrypt = encrypt;
inst->alg.decrypt = decrypt;

- inst->free = free;
+ inst->free = free_inst;

err = skcipher_register_instance(tmpl, inst);
if (err)
--
2.16.2
\
 
 \ /
  Last update: 2018-03-22 20:58    [W:0.134 / U:1.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site