From: Matthew Wilcox <willy@infradead.org>
To: linux-mm@kvack.org
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>,
Matthew Wilcox <mawilcox@microsoft.com>,
linux-kernel@vger.kernel.org,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH 2/4] Rename 'free' functions
Date: Thu, 22 Mar 2018 12:58:17 -0700 [thread overview]
Message-ID: <20180322195819.24271-3-willy@infradead.org> (raw)
In-Reply-To: <20180322195819.24271-1-willy@infradead.org>
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
next prev parent reply other threads:[~2018-03-22 19:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 19:58 [PATCH 0/4] Add free() function Matthew Wilcox
2018-03-22 19:58 ` [PATCH 1/4] decompression: Rename malloc and free Matthew Wilcox
2018-03-22 19:58 ` Matthew Wilcox [this message]
2018-03-22 19:58 ` [PATCH 3/4] mm: Add free() Matthew Wilcox
2018-03-23 8:04 ` Rasmus Villemoes
2018-03-23 14:34 ` Matthew Wilcox
2018-04-03 8:50 ` Pavel Machek
2018-04-03 11:41 ` Matthew Wilcox
2018-03-23 13:33 ` Kirill Tkhai
2018-03-23 15:14 ` Matthew Wilcox
2018-03-23 15:49 ` Kirill Tkhai
2018-03-23 16:15 ` Matthew Wilcox
2018-03-25 23:56 ` Matthew Wilcox
2018-03-24 7:38 ` kbuild test robot
2018-03-22 19:58 ` [PATCH 4/4] rcu: Switch to using free() instead of kfree() Matthew Wilcox
2018-03-24 7:07 ` kbuild test robot
2018-03-24 8:20 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180322195819.24271-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=ktkhai@virtuozzo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mawilcox@microsoft.com \
--cc=paulmck@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).