Commit 0292c54e authored by Li Nan's avatar Li Nan Committed by Zheng Zengkai
Browse files

blk-mq: fix kabi broken in struct bio 

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: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 6530b6a3

include/linux/blk_types.h

+4 −3
Original line number Diff line number Diff line
@@ -239,9 +239,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
@@ -268,7 +265,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)