commit 7ba9eec293b70f7e7204512a59e58205bbb1cecc
author Jaegeuk Kim <jaegeuk@kernel.org> Fri Mar 20 16:57:47 2015 -0700
committer Jaegeuk Kim <jaegeuk@kernel.org> Fri Mar 20 17:01:41 2015 -0700
tree 5e32c85d53ab5a4a446a179883c476180ca31771
parent c93d54a1867858f8b81e2df49fa43f4d7950b43d

fsck.f2fs: show cp_state for fsck.f2fs

This patch adds to show cp_state during fsck.f2fs.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

fsck/f2fs.h

diff --git a/fsck/f2fs.h b/fsck/f2fs.h
index c268f15..709fbf3 100644
--- a/fsck/f2fs.h
+++ b/fsck/f2fs.h
@@ -159,7 +159,6 @@
 	u32 s_next_generation;                  /* for NFS support */
 
 	unsigned int cur_victim_sec;            /* current victim section num */
-
 };
 
 static inline struct f2fs_super_block *F2FS_RAW_SUPER(struct f2fs_sb_info *sbi)

fsck/fsck.h

diff --git a/fsck/fsck.h b/fsck/fsck.h
index 9cad013..98425c6 100644
--- a/fsck/fsck.h
+++ b/fsck/fsck.h
@@ -96,6 +96,7 @@
 int fsck_chk_inline_dentries(struct f2fs_sb_info *, struct f2fs_node *,
 		u32 *, u32 *);
 
+void print_cp_state(u32);
 extern void print_node_info(struct f2fs_node *);
 extern void print_inode_info(struct f2fs_inode *, int);
 extern struct seg_entry *get_seg_entry(struct f2fs_sb_info *, unsigned int);

fsck/main.c

diff --git a/fsck/main.c b/fsck/main.c
index 3606f62..16fab9c 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -140,10 +140,14 @@
 
 static void do_fsck(struct f2fs_sb_info *sbi)
 {
+	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
+	u32 flag = le32_to_cpu(ckpt->ckpt_flags);
 	u32 blk_cnt;
 
 	fsck_init(sbi);
 
+	print_cp_state(flag);
+
 	fsck_chk_orphan_node(sbi);
 
 	/* Traverse all block recursively from root inode */
@@ -175,22 +179,7 @@
 		goto cleanup;
 	}
 
-	MSG(0, "Info: checkpoint state = %x : ", flag);
-	if (flag & CP_FSCK_FLAG)
-		MSG(0, "%s", " fsck");
-	if (flag & CP_ERROR_FLAG)
-		MSG(0, "%s", " error");
-	if (flag & CP_COMPACT_SUM_FLAG)
-		MSG(0, "%s", " compacted_summary");
-	if (flag & CP_ORPHAN_PRESENT_FLAG)
-		MSG(0, "%s", " orphan_inodes");
-	if (flag & CP_FASTBOOT_FLAG)
-		MSG(0, "%s", " fastboot");
-	if (flag & CP_UMOUNT_FLAG)
-		MSG(0, "%s", " unmount");
-	else
-		MSG(0, "%s", " sudden-power-off");
-	MSG(0, "\n");
+	print_cp_state(flag);
 
 	dump_node(sbi, opt->nid);
 cleanup:

fsck/mount.c

diff --git a/fsck/mount.c b/fsck/mount.c
index 6d96db8..879cadb 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -204,6 +204,26 @@
 	printf("\n\n");
 }
 
+void print_cp_state(u32 flag)
+{
+	MSG(0, "Info: checkpoint state = %x : ", flag);
+	if (flag & CP_FSCK_FLAG)
+		MSG(0, "%s", " fsck");
+	if (flag & CP_ERROR_FLAG)
+		MSG(0, "%s", " error");
+	if (flag & CP_COMPACT_SUM_FLAG)
+		MSG(0, "%s", " compacted_summary");
+	if (flag & CP_ORPHAN_PRESENT_FLAG)
+		MSG(0, "%s", " orphan_inodes");
+	if (flag & CP_FASTBOOT_FLAG)
+		MSG(0, "%s", " fastboot");
+	if (flag & CP_UMOUNT_FLAG)
+		MSG(0, "%s", " unmount");
+	else
+		MSG(0, "%s", " sudden-power-off");
+	MSG(0, "\n");
+}
+
 int sanity_check_raw_super(struct f2fs_super_block *raw_super)
 {
 	unsigned int blocksize;