Commit aa0274d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a6db2a5d a07d2d79

include/linux/io_uring/cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, 
 * Note: the caller should never hard code @issue_flags and is only allowed

 * to pass the mask provided by the core io_uring code.

 */

void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2,

void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 res2,

			unsigned issue_flags);



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, 
	return -EOPNOTSUPP;

}

static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,

		ssize_t ret2, unsigned issue_flags)

		u64 ret2, unsigned issue_flags)

{

}

static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,

io_uring/uring_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static inline void io_req_set_cqe32_extra(struct io_kiocb *req, 
 * Called by consumers of io_uring_cmd, if they originally returned

 * -EIOCBQUEUED upon receiving the command.

 */

void io_uring_cmd_done(struct io_uring_cmd *ioucmd, ssize_t ret, ssize_t res2,

void io_uring_cmd_done(struct io_uring_cmd *ioucmd, ssize_t ret, u64 res2,

		       unsigned issue_flags)

{

	struct io_kiocb *req = cmd_to_io_kiocb(ioucmd);