From: Yu Kuai <yukuai3@huawei.com> hulk inclusion category: bugfix bugzilla: 186917, https://gitee.com/openeuler/kernel/issues/I5N1S5 CVE: NA -------------------------------- Signed-off-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Jason Yan <yanaijie@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> --- include/linux/blkdev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3acfadd6724b..58475edd65f4 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -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) -- 2.20.1