Pull io_uring fixes from Jens Axboe: - Remove the sync refill API that was added in this release, in anticipation of doing it in a better way for the next release - Fix type extension for calculating size off nr_pages, like we do in other spots * tag 'io_uring-6.18-20251106' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: io_uring: fix types for region size calulation io_uring/zcrx: remove sync refill uapi
Showing the changes to include/uapi/linux (1 of 5 files). Show all
Unified · Split
| @@ -689,9 +689,6 @@ enum io_uring_register_op { · 688 unmodified lines | |||
| 689 | /* query various aspects of io_uring, see linux/io_uring/query.h */ | 689 | /* query various aspects of io_uring, see linux/io_uring/query.h */ |
| 690 | IORING_REGISTER_QUERY = 35, | 690 | IORING_REGISTER_QUERY = 35, |
| 691 | 691 | ||
| 692 | /* return zcrx buffers back into circulation */ | ||
| 693 | IORING_REGISTER_ZCRX_REFILL = 36, | ||
| 694 | |||
| 695 | /* this goes last */ | 692 | /* this goes last */ |
| 696 | IORING_REGISTER_LAST, | 693 | IORING_REGISTER_LAST, |
| 697 | 694 | ||
| @@ -1073,15 +1070,6 @@ struct io_uring_zcrx_ifq_reg { · 375 unmodified lines | |||
| 1073 | __u64 __resv[3]; | 1070 | __u64 __resv[3]; |
| 1074 | }; | 1071 | }; |
| 1075 | 1072 | ||
| 1076 | struct io_uring_zcrx_sync_refill { | ||
| 1077 | __u32 zcrx_id; | ||
| 1078 | /* the number of entries to return */ | ||
| 1079 | __u32 nr_entries; | ||
| 1080 | /* pointer to an array of struct io_uring_zcrx_rqe */ | ||
| 1081 | __u64 rqes; | ||
| 1082 | __u64 __resv[2]; | ||
| 1083 | }; | ||
| 1084 | |||
| 1085 | #ifdef __cplusplus | 1073 | #ifdef __cplusplus |
| 1086 | } | 1074 | } |
| 1087 | #endif | 1075 | #endif |