mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

io_uring: further deduplicate file slot selection

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

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-02-28 22:35:11 +00:00 committed by Jens Axboe
parent 2c4b8eb643
commit dafecf19e2
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fs/io_uring.c
View file

@ -6204,13 +6204,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,
@ -7478,15 +7484,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;