AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/fs/f2fs/f2fs.h
..
..
@@ -1220,7 +1220,6 @@
1220
1220
 #ifdef CONFIG_BLK_DEV_ZONED
1221
1221
 	unsigned int nr_blkz;		/* Total number of zones */
1222
1222
 	unsigned long *blkz_seq;	/* Bitmap indicating sequential zones */
1223
-	block_t *zone_capacity_blocks;  /* Array of zone capacity in blks */
1224
1223
 #endif
1225
1224
 };
1226
1225
 
..
..
@@ -1288,6 +1287,7 @@
1288
1287
 	GC_IDLE_AT,
1289
1288
 	GC_URGENT_HIGH,
1290
1289
 	GC_URGENT_LOW,
1290
+	GC_URGENT_MID,
1291
1291
 	MAX_GC_MODE,
1292
1292
 };
1293
1293
 
..
..
@@ -1640,6 +1640,7 @@
1640
1640
 	unsigned int meta_ino_num;		/* meta inode number*/
1641
1641
 	unsigned int log_blocks_per_seg;	/* log2 blocks per segment */
1642
1642
 	unsigned int blocks_per_seg;		/* blocks per segment */
1643
+	unsigned int unusable_blocks_per_sec;	/* unusable blocks per section */
1643
1644
 	unsigned int segs_per_sec;		/* segments per section */
1644
1645
 	unsigned int secs_per_zone;		/* sections per zone */
1645
1646
 	unsigned int total_sections;		/* total section count */
..
..
@@ -2758,6 +2759,9 @@
2758
2759
 	if (is_inflight_io(sbi, type))
2759
2760
 		return false;
2760
2761
 
2762
+	if (sbi->gc_mode == GC_URGENT_MID)
2763
+		return true;
2764
+
2761
2765
 	if (sbi->gc_mode == GC_URGENT_LOW &&
2762
2766
 			(type == DISCARD_TIME || type == GC_TIME))
2763
2767
 		return true;
..
..
@@ -3782,7 +3786,7 @@
3782
3786
 int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, bool background, bool force,
3783
3787
 			unsigned int segno);
3784
3788
 void f2fs_build_gc_manager(struct f2fs_sb_info *sbi);
3785
-int f2fs_resize_fs(struct f2fs_sb_info *sbi, __u64 block_count);
3789
+int f2fs_resize_fs(struct file *filp, __u64 block_count);
3786
3790
 int __init f2fs_create_garbage_collection_cache(void);
3787
3791
 void f2fs_destroy_garbage_collection_cache(void);
3788
3792