hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ID0C1D -------------------------------- Use KABI_USE to fix kabi broken in struct request. Signed-off-by: Baokun Li <libaokun1@huawei.com> --- include/linux/blk-mq.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 81a733e1bef9..2254cf730a02 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -115,9 +115,6 @@ struct request { #ifdef CONFIG_BLK_WBT unsigned short wbt_flags; -#endif -#ifdef CONFIG_BLK_CGROUP_IOINFLIGHT - struct blkcg_gq *blkg; #endif /* * rq sectors used for blk stats. It has the same value @@ -211,7 +208,11 @@ struct request { KABI_RESERVE(4) KABI_RESERVE(5) #endif +#ifdef CONFIG_BLK_CGROUP_IOINFLIGHT + KABI_USE(6, struct blkcg_gq *blkg) +#else KABI_RESERVE(6) +#endif KABI_RESERVE(7) KABI_RESERVE(8) }; -- 2.46.1