From: zhangwensheng <zhangwensheng5@huawei.com> hulk inclusion category: bugfix bugzilla: 185891 CVE: NA -------------------------------- because create a new sync_io_tmp in gendisk, to fix the kabi chage; Signed-off-by: zhangwensheng <zhangwensheng5@huawei.com> Reviewed-by: Hou Tao <houtao1@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- include/linux/genhd.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 38737c853b28d..264326ae5a903 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -212,6 +212,7 @@ struct gendisk { struct kobject *slave_dir; struct timer_rand_state *random; + atomic_t sync_io; /* RAID */ struct disk_events *ev; #ifdef CONFIG_BLK_DEV_INTEGRITY struct kobject integrity_kobj; @@ -219,14 +220,14 @@ struct gendisk { int node_id; struct badblocks *bb; struct lockdep_map lockdep_map; - atomic64_t sync_io_sectors; /* RAID */ #ifndef __GENKSYMS__ unsigned long *user_ro_bitmap; + atomic64_t sync_io_sectors; /* RAID */ #else KABI_RESERVE(1) -#endif KABI_RESERVE(2) +#endif KABI_RESERVE(3) KABI_RESERVE(4) }; -- 2.25.1