提交 f732aa57 编写于 作者: Y Yu Kuai 提交者: Zheng Zengkai

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: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NJason Yan <yanaijie@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 55d9222b
...@@ -499,8 +499,6 @@ struct request_queue { ...@@ -499,8 +499,6 @@ struct request_queue {
atomic_t nr_active_requests_shared_sbitmap; atomic_t nr_active_requests_shared_sbitmap;
struct blk_mq_tags *shared_sbitmap_tags;
struct list_head icq_list; struct list_head icq_list;
#ifdef CONFIG_BLK_CGROUP #ifdef CONFIG_BLK_CGROUP
DECLARE_BITMAP (blkcg_pols, BLKCG_MAX_POLS); DECLARE_BITMAP (blkcg_pols, BLKCG_MAX_POLS);
...@@ -604,6 +602,8 @@ struct request_queue { ...@@ -604,6 +602,8 @@ struct request_queue {
#define BLK_MAX_WRITE_HINTS 5 #define BLK_MAX_WRITE_HINTS 5
u64 write_hints[BLK_MAX_WRITE_HINTS]; 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(1)
KABI_RESERVE(2) KABI_RESERVE(2)
KABI_RESERVE(3) KABI_RESERVE(3)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册