diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-19 02:21:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-19 02:21:30 +0200 |
| commit | 01464a73a6387b45aa4cf6ea522abd4f9e44dce5 (patch) | |
| tree | 0dc47c3cda87f9759fd544d17fd62a585db8d936 /include/trace | |
| parent | Merge tag 'audit-pr-20220518' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | io_uring: don't attempt to IOPOLL for MSG_RING requests (diff) | |
| download | linux-01464a73a6387b45aa4cf6ea522abd4f9e44dce5.tar.xz linux-01464a73a6387b45aa4cf6ea522abd4f9e44dce5.zip | |
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
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/io_uring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/io_uring.h b/include/trace/events/io_uring.h index cddf5b6fbeb4..80d2588a090c 100644 --- a/include/trace/events/io_uring.h +++ b/include/trace/events/io_uring.h @@ -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 ) |