diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-01 20:52:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-01 20:52:01 +0300 |
| commit | 0a35d1622d5cd7693d75b7124913c75a7e3fabd0 (patch) | |
| tree | 616bd5c6c71eccdb7f13d6e50e522b9032aa1683 /include | |
| parent | d516e221e2fb88cd31c7ea29d743045efc4e69dd (diff) | |
| parent | 09007af2b627f0f195c6c53c4829b285cc3990ec (diff) | |
| download | linux-0a35d1622d5cd7693d75b7124913c75a7e3fabd0.tar.xz | |
Merge tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block
Pull io_uring fixes from Jens Axboe:
"Two minor tweaks:
- While we still can, adjust the send/recv based flags to be in
->ioprio rather than in ->addr2. This is consistent with eg accept,
and also doesn't waste a full 64-bit field for flags (Pavel)
- 5.18-stable fix for re-importing provided buffers. Not much real
world relevance here as it'll only impact non-pollable files gone
async, which is more of a practical test case rather than something
that is used in the wild (Dylan)"
* tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block:
io_uring: fix provided buffer import
io_uring: keep sendrecv flags in ioprio
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 53e7dae92e42..f10b59d6693e 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -244,7 +244,7 @@ enum io_uring_op { #define IORING_ASYNC_CANCEL_ANY (1U << 2) /* - * send/sendmsg and recv/recvmsg flags (sqe->addr2) + * send/sendmsg and recv/recvmsg flags (sqe->ioprio) * * IORING_RECVSEND_POLL_FIRST If set, instead of first attempting to send * or receive and arm poll if that yields an |