tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 01464a73 8194a008

+4 -1
+3
fs/io_uring.c
··· 4481 4481 if (ret < 0) 4482 4482 req_set_fail(req); 4483 4483 __io_req_complete(req, issue_flags, ret, 0); 4484 + /* put file to avoid an attempt to IOPOLL the req */ 4485 + io_put_file(req->file); 4486 + req->file = NULL; 4484 4487 return 0; 4485 4488 } 4486 4489
+1 -1
include/trace/events/io_uring.h
··· 147 147 TP_PROTO(void *ctx, void * req, unsigned long long user_data, u8 opcode, 148 148 unsigned int flags, struct io_wq_work *work, int rw), 149 149 150 - TP_ARGS(ctx, req, user_data, flags, opcode, work, rw), 150 + TP_ARGS(ctx, req, user_data, opcode, flags, work, rw), 151 151 152 152 TP_STRUCT__entry ( 153 153 __field( void *, ctx )