Skip to contentSkip to conversation

fsck.f2fs: check sit types for node or data only

PATCH New Jaegeuk Kim 1 participant 1 message Sep 24, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fsck.f2fs: check sit types for node or data only

Previously, check_sit_types didn't handle different numbers of active logs and SSR cases. But, it didn't cause any problem since fixing sit types is harmless. Nevertheless, we still don't need to change them all.

---
 fsck/fsck.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
fsck/fsck.c +10 -12
index 70efce6..d3b5dd4 100644
@@ -18,21 +18,19 @@ static inline int f2fs_set_main_bitmap(struct f2fs_sb_info *sbi, u32 blk,
 {
 	struct f2fs_fsck *fsck = F2FS_FSCK(sbi);
 	struct seg_entry *se;
+	int fix = 0;
 
 	se = get_seg_entry(sbi, GET_SEGNO(sbi, blk));
-	if (se->type != type) {
-		if (type == CURSEG_WARM_DATA) {
-			if (se->type != CURSEG_COLD_DATA) {
-				DBG(1, "Wrong segment type [0x%x] %x -> %x",
-						GET_SEGNO(sbi, blk), se->type,
-						CURSEG_WARM_DATA);
-				se->type = CURSEG_WARM_DATA;
-			}
-		} else {
-			DBG(1, "Wrong segment type [0x%x] %x -> %x",
+	if (se->type < 0 || se->type >= NO_CHECK_TYPE)
+		fix = 1;
+	else if (IS_DATASEG(se->type) != IS_DATASEG(type))
+		fix = 1;
+
+	/* just check data and node types */
+	if (fix) {
+		DBG(1, "Wrong segment type [0x%x] %x -> %x",
 				GET_SEGNO(sbi, blk), se->type, type);
-			se->type = type;
-		}
+		se->type = type;
 	}
 	return f2fs_set_bit(BLKOFF_FROM_MAIN(sbi, blk), fsck->main_area_bitmap);
 }
Signature · 4 lines
2.1.1


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