hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICJPON -------------------------------- Fix kabi broken in struct io_ring_ctx. Fixes: 93b8cc60c37b ("io_uring: cancelable uring_cmd") Fixes: 902ce82c2aa1 ("io_uring: get rid of intermediate aux cqe caches") Signed-off-by: Long Li <leo.lilong@huawei.com> --- include/linux/io_uring_types.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index 65d3d06bdb50..8cf36a953086 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -295,12 +295,6 @@ struct io_ring_ctx { */ struct io_wq_work_list iopoll_list; bool poll_multi_queue; - - /* - * Any cancelable uring_cmd is added to this list in - * ->uring_cmd() by io_uring_cmd_insert_cancelable() - */ - struct hlist_head cancelable_uring_cmd; } ____cacheline_aligned_in_smp; struct { @@ -337,6 +331,8 @@ struct io_ring_ctx { unsigned cq_last_tm_flush; } ____cacheline_aligned_in_smp; + KABI_REPLACE(struct io_uring_cqe completion_cqes[16], struct hlist_head cancelable_uring_cmd) + spinlock_t completion_lock; /* IRQ completion list, under ->completion_lock */ -- 2.39.2