commit aa0274d261cc50af416883effdab505fad400485 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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 1 year ago aa0274d2 a6db2a5d

+3 -3

2 changed files

expand all

unified split

include

linux

io_uring

cmd.h

io_uring

uring_cmd.c

+2 -2

include/linux/io_uring/cmd.h

··· 43 * Note: the caller should never hard code @issue_flags and is only allowed 44 * to pass the mask provided by the core io_uring code. 45 */ 46 - void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2, 47 unsigned issue_flags); 48 49 void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd, ··· 67 return -EOPNOTSUPP; 68 } 69 static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, 70 - ssize_t ret2, unsigned issue_flags) 71 { 72 } 73 static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,

··· 43 * Note: the caller should never hard code @issue_flags and is only allowed 44 * to pass the mask provided by the core io_uring code. 45 */ 46 + void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 res2, 47 unsigned issue_flags); 48 49 void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd, ··· 67 return -EOPNOTSUPP; 68 } 69 static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, 70 + u64 ret2, unsigned issue_flags) 71 { 72 } 73 static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,

+1 -1

io_uring/uring_cmd.c

··· 151 * Called by consumers of io_uring_cmd, if they originally returned 152 * -EIOCBQUEUED upon receiving the command. 153 */ 154 - void io_uring_cmd_done(struct io_uring_cmd *ioucmd, ssize_t ret, ssize_t res2, 155 unsigned issue_flags) 156 { 157 struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);

··· 151 * Called by consumers of io_uring_cmd, if they originally returned 152 * -EIOCBQUEUED upon receiving the command. 153 */ 154 + void io_uring_cmd_done(struct io_uring_cmd *ioucmd, ssize_t ret, u64 res2, 155 unsigned issue_flags) 156 { 157 struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);