Commit 01464a73 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.18-2022-05-18' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:
 "Two small changes fixing issues from the 5.18 merge window:

   - Fix wrong ordering of a tracepoint (Dylan)

   - Fix MSG_RING on IOPOLL rings (me)"

* tag 'io_uring-5.18-2022-05-18' of git://git.kernel.dk/linux-block:
  io_uring: don't attempt to IOPOLL for MSG_RING requests
  io_uring: fix ordering of args in io_uring_queue_async_work
parents 8194a008 aa184e86

fs/io_uring.c

+3 −0
Original line number Diff line number Diff line
@@ -4481,6 +4481,9 @@ static int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags) 
	if (ret < 0)

		req_set_fail(req);

	__io_req_complete(req, issue_flags, ret, 0);

	/* put file to avoid an attempt to IOPOLL the req */

	io_put_file(req->file);

	req->file = NULL;

	return 0;

}

include/trace/events/io_uring.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ TRACE_EVENT(io_uring_queue_async_work, 
	TP_PROTO(void *ctx, void * req, unsigned long long user_data, u8 opcode,

		unsigned int flags, struct io_wq_work *work, int rw),



	TP_ARGS(ctx, req, user_data, flags, opcode, work, rw),

	TP_ARGS(ctx, req, user_data, opcode, flags, work, rw),



	TP_STRUCT__entry (

		__field(  void *,			ctx		)