From: Li Nan <linan122@huawei.com> hulk inclusion category: bugfix bugzilla: 187921, https://gitee.com/openeuler/kernel/issues/I66VDB CVE: NA -------------------------------- Enable CONFIG_BLK_CGROUP_IOCOST will cause kabi broken, use reserved fields to fix it. Signed-off-by: Li Nan <linan122@huawei.com> Reviewed-by: Hou Tao <houtao1@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> --- include/linux/blk_types.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index a0ec5ff216ff..b23db4257a24 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -234,9 +234,6 @@ struct bio { */ struct blkcg_gq *bi_blkg; struct bio_issue bi_issue; -#ifdef CONFIG_BLK_CGROUP_IOCOST - u64 bi_iocost_cost; -#endif #endif #ifdef CONFIG_BLK_INLINE_ENCRYPTION @@ -263,7 +260,11 @@ struct bio { struct bio_set *bi_pool; +#ifdef CONFIG_BLK_CGROUP_IOCOST + KABI_USE(1, u64 bi_iocost_cost) +#else KABI_RESERVE(1) +#endif KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) -- 2.20.1