[PATCH 1/2] fsck.f2fs: assign checkpoint pointer correctly

[PATCH 1/2] fsck.f2fs: assign checkpoint pointer correctly

[Jaegeuk Kim]

This patch fixes a bug that cp pointer is not assigned correctly.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fsck/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsck/mount.c b/fsck/mount.c
index 002a7cb..c4dfb0a 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -1725,6 +1725,7 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)
 		ERR_MSG("Checkpoint is polluted\n");
 		return -1;
 	}
+	cp = F2FS_CKPT(sbi);
 
 	print_ckpt_info(sbi);
 
@@ -1739,7 +1740,6 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)
 
 	config.bug_on = 0;
 
-	cp = F2FS_CKPT(sbi);
 	sbi->total_valid_node_count = get_cp(valid_node_count);
 	sbi->total_valid_inode_count = get_cp(valid_inode_count);
 	sbi->user_block_count = get_cp(user_block_count);
-- 
2.6.3


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140

[PATCH 2/2] fsck.f2fs: return 0 for no error was reported

[Jaegeuk Kim]

When skipping fsck, return 0 with message.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fsck/main.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/fsck/main.c b/fsck/main.c
index d70b9ed..54dbb2d 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -330,8 +330,13 @@ fsck_again:
 	sbi = &gfsck.sbi;
 
 	ret = f2fs_do_mount(sbi);
-	if (ret != 0)
+	if (ret != 0) {
+		if (ret == 1) {
+			MSG(0, "Info: No error was reported\n");
+			ret = 0;
+		}
 		goto out_err;
+	}
 
 	switch (config.func) {
 	case FSCK:
@@ -341,7 +346,8 @@ fsck_again:
 		do_dump(sbi);
 		break;
 	case DEFRAG:
-		if (do_defrag(sbi))
+		ret = do_defrag(sbi);
+		if (ret)
 			goto out_err;
 		break;
 	}
@@ -376,5 +382,5 @@ out_err:
 		free(sbi->ckpt);
 	if (sbi->raw_super)
 		free(sbi->raw_super);
-	return -1;
+	return ret;
 }
-- 
2.6.3


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140