[Ocfs2-tools-devel] [PATCH 4/6] extras: Check the validity of variables before use

piaojun piaojun at huawei.com
Wed Mar 25 23:56:23 PDT 2015


In main(), we need check the value ocfs2_bitmap_test() returns. Because if
OCFS2_ET_INVALID_BIT is returned, we should end main().

Signed-off-by: Jun Piao <piaojun at huawei.com>
Reviewed-by: Alex Chen <alex.chen at huawei.com>

---
 extras/find_hardlinks.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/extras/find_hardlinks.c b/extras/find_hardlinks.c
index 2e1f697..3d6e0dd 100644
--- a/extras/find_hardlinks.c
+++ b/extras/find_hardlinks.c
@@ -203,13 +203,24 @@ int main(int argc, char *argv[])
 		goto out_close;
 	}

-	ocfs2_bitmap_set(wp.inode_map,
+	ret = ocfs2_bitmap_set(wp.inode_map,
 			 OCFS2_RAW_SB(fs->fs_super)->s_system_dir_blkno,
 			 NULL);
-	ocfs2_bitmap_set(wp.inode_map,
+	if (ret) {
+		com_err(argv[0], ret,
+			"while seting inode bitmap %"PRIu64"\n",
+			(uint64_t)(OCFS2_RAW_SB(fs->fs_super)->s_system_dir_blkno));
+		goto out_close;
+	}
+	ret = ocfs2_bitmap_set(wp.inode_map,
 			 OCFS2_RAW_SB(fs->fs_super)->s_root_blkno,
 			 NULL);
-
+	if (ret) {
+		com_err(argv[0], ret,
+			"while seting inode bitmap %"PRIu64"\n",
+			(uint64_t)(OCFS2_RAW_SB(fs->fs_super)->s_root_blkno));
+		goto out_close;
+	}
 	fprintf(stdout, "Walking system directory...\n");
 	wp.path = "<system_dir>/";
 	ret = ocfs2_dir_iterate(fs,
-- 1.8.4.3




More information about the Ocfs2-tools-devel mailing list