Skip to content

[pull] master from axboe:master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
May 14, 2025
Merged

[pull] master from axboe:master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16777f9
register: use io_uring_rsrc_update instead of io_uring_files_update
calebsander Apr 10, 2025
b64d75e
Merge branch 'fix/io_uring_rsrc_update' of https://github.com/calebsa…
axboe May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion man/io_uring_register.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ or replacing an existing entry with a new existing entry.
.I arg
must contain a pointer to a
.I struct
.IR io_uring_files_update ,
.IR io_uring_rsrc_update ,
which contains
an offset on which to start the update, and an array of file descriptors to
use for the update.
Expand Down
4 changes: 2 additions & 2 deletions src/register.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ int io_uring_register_files_update(struct io_uring *ring, unsigned off,
{
liburing_sanitize_address(files);

struct io_uring_files_update up = {
struct io_uring_rsrc_update up = {
.offset = off,
.fds = (unsigned long) files,
.data = (unsigned long) files,
};

return do_register(ring, IORING_REGISTER_FILES_UPDATE, &up, nr_files);
Expand Down