From: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
To: axboe@kernel.dk, asml.silence@gmail.com, io-uring@vger.kernel.org
Subject: [PATCH v5 11/13] io_uring: make percpu_ref_release names consistent
Date: Tue, 12 Jan 2021 13:33:11 -0800 [thread overview]
Message-ID: <1610487193-21374-12-git-send-email-bijan.mottahedeh@oracle.com> (raw)
In-Reply-To: <1610487193-21374-1-git-send-email-bijan.mottahedeh@oracle.com>
Make the percpu ref release function names consistent between rsrc data
and nodes.
Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
---
fs/io_uring.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 96f760e..5ab0ff1 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7297,7 +7297,7 @@ static void __io_sqe_files_unregister(struct io_ring_ctx *ctx)
#endif
}
-static void io_rsrc_ref_kill(struct percpu_ref *ref)
+static void io_rsrc_data_ref_zero(struct percpu_ref *ref)
{
struct fixed_rsrc_data *data;
@@ -7376,7 +7376,7 @@ static struct fixed_rsrc_data *alloc_fixed_rsrc_data(struct io_ring_ctx *ctx)
data->ctx = ctx;
init_completion(&data->done);
- if (percpu_ref_init(&data->refs, io_rsrc_ref_kill,
+ if (percpu_ref_init(&data->refs, io_rsrc_data_ref_zero,
PERCPU_REF_ALLOW_REINIT, GFP_KERNEL)) {
kfree(data);
return ERR_PTR(-ENOMEM);
@@ -7759,7 +7759,7 @@ static void io_rsrc_put_work(struct work_struct *work)
}
}
-static void io_rsrc_data_ref_zero(struct percpu_ref *ref)
+static void io_rsrc_node_ref_zero(struct percpu_ref *ref)
{
struct fixed_rsrc_ref_node *ref_node;
struct fixed_rsrc_data *data;
@@ -7803,7 +7803,7 @@ static struct fixed_rsrc_ref_node *alloc_fixed_rsrc_ref_node(
if (!ref_node)
return ERR_PTR(-ENOMEM);
- if (percpu_ref_init(&ref_node->refs, io_rsrc_data_ref_zero,
+ if (percpu_ref_init(&ref_node->refs, io_rsrc_node_ref_zero,
0, GFP_KERNEL)) {
kfree(ref_node);
return ERR_PTR(-ENOMEM);
--
1.8.3.1
next prev parent reply other threads:[~2021-01-12 22:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 21:33 [PATCH v5 00/13] io_uring: buffer registration enhancements Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 01/13] io_uring: rename file related variables to rsrc Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 02/13] io_uring: generalize io_queue_rsrc_removal Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 03/13] io_uring: separate ref_list from fixed_rsrc_data Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 04/13] io_uring: split alloc_fixed_file_ref_node Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 05/13] io_uring: add rsrc_ref locking routines Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 06/13] io_uring: implement fixed buffers registration similar to fixed files Bijan Mottahedeh
2021-01-15 17:41 ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 07/13] io_uring: create common fixed_rsrc_ref_node handling routines Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 08/13] io_uring: generalize files_update functionlity to rsrc_update Bijan Mottahedeh
2021-01-16 18:20 ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 09/13] io_uring: support buffer registration updates Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 10/13] io_uring: create common fixed_rsrc_data allocation routines Bijan Mottahedeh
2021-01-16 18:26 ` Pavel Begunkov
2021-01-12 21:33 ` Bijan Mottahedeh [this message]
2021-01-12 21:33 ` [PATCH v5 12/13] io_uring: call io_get_fixed_rsrc_ref for buffers Bijan Mottahedeh
2021-01-15 17:44 ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 13/13] io_uring: support buffer registration sharing Bijan Mottahedeh
2021-01-14 2:01 ` Bijan Mottahedeh
2021-01-14 21:17 ` Bijan Mottahedeh
2021-01-16 18:30 ` Pavel Begunkov
2021-01-14 21:20 ` [PATCH v5 00/13] io_uring: buffer registration enhancements Pavel Begunkov
2021-01-14 22:44 ` Bijan Mottahedeh
2021-01-14 22:54 ` Bijan Mottahedeh
2021-01-15 4:42 ` Pavel Begunkov
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=1610487193-21374-12-git-send-email-bijan.mottahedeh@oracle.com \
--to=bijan.mottahedeh@oracle.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/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).