From: Luo Meng luomeng12@huawei.com
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5ETAB CVE: NA
--------------------------------
Because add state in gendisk and remove flags in block_device, to fix the kabi chage.
Signed-off-by: Luo Meng luomeng12@huawei.com Reviewed-by: Jason Yan yanaijie@huawei.com Signed-off-by: Laibin Qiu qiulaibin@huawei.com --- include/linux/fs.h | 1 + include/linux/genhd.h | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h index 025b98fbab05..bcd2131ca06c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -479,6 +479,7 @@ struct block_device { struct hd_struct * bd_part; /* number of times partitions within this device have been opened. */ unsigned bd_part_count; + int bd_invalidated; struct gendisk * bd_disk; struct request_queue * bd_queue; struct backing_dev_info *bd_bdi; diff --git a/include/linux/genhd.h b/include/linux/genhd.h index f3fc01f0e84c..50c76a59d7e2 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -180,6 +180,8 @@ struct blk_integrity {
#endif /* CONFIG_BLK_DEV_INTEGRITY */
+#define GD_NEED_PART_SCAN 0 + struct gendisk { /* major, first_minor and minors are input parameters only, * don't use directly. Use disk_devt() and disk_max_parts(). @@ -208,8 +210,6 @@ struct gendisk { void *private_data;
int flags; - unsigned long state; -#define GD_NEED_PART_SCAN 0 struct rw_semaphore lookup_sem; struct kobject *slave_dir;
@@ -226,11 +226,12 @@ struct gendisk { #ifndef __GENKSYMS__ unsigned long *user_ro_bitmap; atomic64_t sync_io_sectors; /* RAID */ + unsigned long state; #else KABI_RESERVE(1) KABI_RESERVE(2) -#endif KABI_RESERVE(3) +#endif KABI_RESERVE(4) };