Skip to content

Commit

Permalink
io_uring/rsrc: simplify single file node switching
Browse files Browse the repository at this point in the history
At maximum io_install_fixed_file() removes only one file, so no need to
keep needs_switch state and we can call io_rsrc_node_switch() right after
removal.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/37cfb46f46160f81dced79f646e97db608994574.1681395792.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
isilence authored and axboe committed Apr 15, 2023
1 parent 9a57fff commit c87fd58
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions io_uring/filetable.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ static int io_install_fixed_file(struct io_ring_ctx *ctx, struct file *file,
u32 slot_index)
__must_hold(&req->ctx->uring_lock)
{
bool needs_switch = false;
struct io_fixed_file *file_slot;
int ret;

Expand All @@ -83,16 +82,17 @@ static int io_install_fixed_file(struct io_ring_ctx *ctx, struct file *file,

ret = io_rsrc_node_switch_start(ctx);
if (ret)
goto err;
return ret;

old_file = (struct file *)(file_slot->file_ptr & FFS_MASK);
ret = io_queue_rsrc_removal(ctx->file_data, slot_index,
ctx->rsrc_node, old_file);
if (ret)
goto err;
return ret;

file_slot->file_ptr = 0;
io_file_bitmap_clear(&ctx->file_table, slot_index);
needs_switch = true;
io_rsrc_node_switch(ctx, ctx->file_data);
}

ret = io_scm_file_account(ctx, file);
Expand All @@ -101,9 +101,6 @@ static int io_install_fixed_file(struct io_ring_ctx *ctx, struct file *file,
io_fixed_file_set(file_slot, file);
io_file_bitmap_set(&ctx->file_table, slot_index);
}
err:
if (needs_switch)
io_rsrc_node_switch(ctx, ctx->file_data);
return ret;
}

Expand Down

0 comments on commit c87fd58

Please sign in to comment.