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/blk-mq.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 1707f217c636..aa0c8ef9a50f 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -270,14 +270,17 @@ struct blk_mq_tag_set { unsigned int flags; void *driver_data; - struct blk_mq_tags **tags; + KABI_DEPRECATE(atomic_t, active_queues_shared_sbitmap) + KABI_DEPRECATE(atomic_t, pending_queues_shared_sbitmap) + KABI_DEPRECATE(struct sbitmap_queue, __bitmap_tags) + KABI_DEPRECATE(struct sbitmap_queue, __breserved_tags) - struct blk_mq_tags *shared_sbitmap_tags; + struct blk_mq_tags **tags; struct mutex tag_list_lock; struct list_head tag_list; - KABI_RESERVE(1) + KABI_USE(1, struct blk_mq_tags *shared_sbitmap_tags) KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) -- 2.20.1