Commit f732aa57 authored by Yu Kuai's avatar Yu Kuai Committed by Zheng Zengkai
Browse files

block: fix kabi broken in request_queue 

hulk inclusion
category: bugfix
bugzilla: 186917, https://gitee.com/openeuler/kernel/issues/I5N1S5


CVE: NA

--------------------------------

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 55d9222b

include/linux/blkdev.h

+2 −2
Original line number Diff line number Diff line
@@ -499,8 +499,6 @@ struct request_queue { 


	atomic_t		nr_active_requests_shared_sbitmap;



	struct blk_mq_tags	*shared_sbitmap_tags;



	struct list_head	icq_list;

#ifdef CONFIG_BLK_CGROUP

	DECLARE_BITMAP		(blkcg_pols, BLKCG_MAX_POLS);
@@ -604,6 +602,8 @@ struct request_queue { 
#define BLK_MAX_WRITE_HINTS	5

	u64			write_hints[BLK_MAX_WRITE_HINTS];



	KABI_REPLACE(unsigned long dtag_wait_time,

		     struct blk_mq_tags *shared_sbitmap_tags)

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)