History

Merge tag 'io_uring-6.13-20241207' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe: "A single fix for a parameter type which affects 32-bit" * tag 'io_uring-6.13-20241207' of git://git.kernel.dk/linux: io_uring: Change res2 parameter type in io_uring_cmd_done

Linus Torvalds committed 1 year ago

Commit aa0274d2 parents a6db2a5 a07d2d72 files · +3 −3Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/io_uring/cmd.h+2−2
@@ -43,7 +43,7 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, · 42 unmodified lines
4343 * Note: the caller should never hard code @issue_flags and is only allowed
4444 * to pass the mask provided by the core io_uring code.
4545 */
46−void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2,
46+void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 res2,
4747 unsigned issue_flags);
4848
4949 void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
@@ -67,7 +67,7 @@ static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, · 17 unmodified lines
6767 return -EOPNOTSUPP;
6868 }
6969 static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,
70− ssize_t ret2, unsigned issue_flags)
70+ u64 ret2, unsigned issue_flags)
7171 {
7272 }
7373 static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t