public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 03/12] io_uring: further deduplicate file slot selection
Date: Sun, 28 Feb 2021 22:35:11 +0000	[thread overview]
Message-ID: <6f2b93aceecf5591b845542d18babae13c8bbef0.1614551467.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

io_fixed_file_slot() and io_file_from_index() behave pretty similarly,
DRY and call one from another.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 528ab1666eb5..e3c36c1dcfad 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6080,13 +6080,19 @@ static void io_wq_submit_work(struct io_wq_work *work)
 	}
 }
 
-static inline struct file *io_file_from_index(struct io_ring_ctx *ctx,
-					      int index)
+static inline struct file **io_fixed_file_slot(struct fixed_rsrc_data *file_data,
+					       unsigned i)
 {
 	struct fixed_rsrc_table *table;
 
-	table = &ctx->file_data->table[index >> IORING_FILE_TABLE_SHIFT];
-	return table->files[index & IORING_FILE_TABLE_MASK];
+	table = &file_data->table[i >> IORING_FILE_TABLE_SHIFT];
+	return &table->files[i & IORING_FILE_TABLE_MASK];
+}
+
+static inline struct file *io_file_from_index(struct io_ring_ctx *ctx,
+					      int index)
+{
+	return *io_fixed_file_slot(ctx->file_data, index);
 }
 
 static struct file *io_file_get(struct io_submit_state *state,
@@ -7397,15 +7403,6 @@ static void io_rsrc_put_work(struct work_struct *work)
 	}
 }
 
-static struct file **io_fixed_file_slot(struct fixed_rsrc_data *file_data,
-					unsigned i)
-{
-	struct fixed_rsrc_table *table;
-
-	table = &file_data->table[i >> IORING_FILE_TABLE_SHIFT];
-	return &table->files[i & IORING_FILE_TABLE_MASK];
-}
-
 static void io_rsrc_node_ref_zero(struct percpu_ref *ref)
 {
 	struct fixed_rsrc_ref_node *ref_node;
-- 
2.24.0


  parent reply	other threads:[~2021-02-28 22:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-28 22:35 [PATCH RESEND for-next 00/12] 5.13 first batch Pavel Begunkov
2021-02-28 22:35 ` [PATCH 01/12] io_uring: avoid taking ctx refs for task-cancel Pavel Begunkov
2021-02-28 22:35 ` [PATCH 02/12] io_uring: reuse io_req_task_queue_fail() Pavel Begunkov
2021-02-28 22:35 ` Pavel Begunkov [this message]
2021-02-28 22:35 ` [PATCH 04/12] io_uring: add a helper failing not issued requests Pavel Begunkov
2021-02-28 22:35 ` [PATCH 05/12] io_uring: refactor provide/remove buffer locking Pavel Begunkov
2021-02-28 22:35 ` [PATCH 06/12] io_uring: don't restirct issue_flags for io_openat Pavel Begunkov
2021-02-28 22:35 ` [PATCH 07/12] io_uring: use better types for cflags Pavel Begunkov
2021-02-28 22:35 ` [PATCH 08/12] io_uring: refactor out send/recv async setup Pavel Begunkov
2021-02-28 22:35 ` [PATCH 09/12] io_uring: untie alloc_async_data and needs_async_data Pavel Begunkov
2021-02-28 22:35 ` [PATCH 10/12] io_uring: rethink def->needs_async_data Pavel Begunkov
2021-02-28 22:35 ` [PATCH 11/12] io_uring: merge defer_prep() and prep_async() Pavel Begunkov
2021-02-28 22:35 ` [PATCH 12/12] io_uring: simplify io_resubmit_prep() Pavel Begunkov
2021-03-01 23:53 ` [PATCH RESEND for-next 00/12] 5.13 first batch Jens Axboe

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=6f2b93aceecf5591b845542d18babae13c8bbef0.1614551467.git.asml.silence@gmail.com \
    [email protected] \
    [email protected] \
    [email protected] \
    /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