Revert "block:Fix kabi broken"

hulk inclusion
category: bugfix
bugzilla: 187190, https://gitee.com/src-openeuler/kernel/issues/I5GWOV
CVE: NA

--------------------------------

This reverts commit 64ba823f.

The patches that broke kabi will be reverted together.
Signed-off-by: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NJason Yan <yanaijie@huawei.com>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>

include/linux/fs.h

@@ -479,7 +479,6 @@ 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;

include/linux/genhd.h

@@ -180,8 +180,6 @@ 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().
@@ -210,6 +208,8 @@ 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,12 +226,11 @@ 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)
-	KABI_RESERVE(3)
 #endif
+	KABI_RESERVE(3)
 	KABI_RESERVE(4)
 };