[Ocfs2-tools-devel] [PATCH 06/10] Ocfs2-tools: Adjust corrupt handlers for fswreck's chain.c

[Tristan Ye]

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 fswreck/chain.c         |   65 ++++++++++++++++------------------------------
 fswreck/include/chain.h |   26 +++++++++++++------
 2 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/fswreck/chain.c b/fswreck/chain.c
index 87993fa..4a3c793 100644
--- a/fswreck/chain.c
+++ b/fswreck/chain.c
@@ -337,17 +337,13 @@ bail:
 }
 
 static void mess_up_sys_chains(ocfs2_filesys *fs, uint16_t slotnum,
-			enum fsck_type *types, int num)
+			       enum fsck_type type)
 {
 	errcode_t ret;
 	char sysfile[OCFS2_MAX_FILENAME_LEN];
 	uint64_t blkno;
-	int i;
 	struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
 	
-	if (num <= 0)
-		FSWRK_FATAL("Invalid num = %d\n", num);
-	
 	if (slotnum == UINT16_MAX)
 		snprintf(sysfile, sizeof(sysfile),
 		ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
@@ -361,61 +357,44 @@ static void mess_up_sys_chains(ocfs2_filesys *fs, uint16_t slotnum,
 	if (ret)
 		FSWRK_COM_FATAL(progname, ret);
 	
-	for(i = 0; i < num; i++) 
-		mess_up_sys_file(fs, blkno, types[i]);
+	mess_up_sys_file(fs, blkno, type);
 
 	return ;
 }
 
-void mess_up_chains_list(ocfs2_filesys *fs,  uint16_t slotnum)
+void mess_up_chains_list(ocfs2_filesys *fs, enum fsck_type type,
+			 uint16_t slotnum)
 {
-	
-	enum fsck_type types[] = { 	CHAIN_COUNT,
-					CHAIN_NEXT_FREE };
-	int numtypes = sizeof(types) / sizeof(enum fsck_type);
-
-	mess_up_sys_chains(fs, slotnum, types, numtypes);
+	mess_up_sys_chains(fs, slotnum, type);
 }
 
-void mess_up_chains_rec(ocfs2_filesys *fs,   uint16_t slotnum)
+void mess_up_chains_rec(ocfs2_filesys *fs, enum fsck_type type,
+			uint16_t slotnum)
 {
 	
-	enum fsck_type types[] = { 	CHAIN_EMPTY,
-					CHAIN_HEAD_LINK_RANGE,
-					CHAIN_BITS };
-	int numtypes = sizeof(types) / sizeof(enum fsck_type);
-
-	mess_up_sys_chains(fs, slotnum, types, numtypes);
+	mess_up_sys_chains(fs, slotnum, type);
 }
 
-void mess_up_chains_inode(ocfs2_filesys *fs, uint16_t slotnum)
+void mess_up_chains_inode(ocfs2_filesys *fs, enum fsck_type type,
+			  uint16_t slotnum)
 {
-	enum fsck_type types[] = { 	CHAIN_I_CLUSTERS, 
-					CHAIN_I_SIZE,
-					CHAIN_GROUP_BITS };
-	int numtypes = sizeof(types) / sizeof(enum fsck_type);
-
-	mess_up_sys_chains(fs, slotnum, types, numtypes);
+	mess_up_sys_chains(fs, slotnum, type);
 }
 
-void mess_up_chains_group(ocfs2_filesys *fs, uint16_t slotnum)
+void mess_up_chains_group(ocfs2_filesys *fs, enum fsck_type type,
+			  uint16_t slotnum)
 {
-	enum fsck_type types[] = { 	CHAIN_LINK_GEN,
-					CHAIN_LINK_RANGE };
-	int numtypes = sizeof(types) / sizeof(enum fsck_type);
-
-	mess_up_sys_chains(fs, slotnum, types, numtypes);
+	mess_up_sys_chains(fs, slotnum, type);
 }
 
-void mess_up_chains_group_magic(ocfs2_filesys *fs, uint16_t slotnum)
+void mess_up_chains_group_magic(ocfs2_filesys *fs, enum fsck_type type,
+				uint16_t slotnum)
 {
-	enum fsck_type types[] = { CHAIN_LINK_MAGIC };
-	int numtypes = sizeof(types) / sizeof(enum fsck_type);
-
-	mess_up_sys_chains(fs, slotnum, types, numtypes);
+	mess_up_sys_chains(fs, slotnum, type);
 }
 
-void mess_up_chains_cpg(ocfs2_filesys *fs, uint16_t slotnum)
+void mess_up_chains_cpg(ocfs2_filesys *fs, enum fsck_type type,
+			uint16_t slotnum)
 {
 	errcode_t ret;
 	char sysfile[OCFS2_MAX_FILENAME_LEN];
@@ -477,12 +456,14 @@ static void mess_up_superblock_clusters(ocfs2_filesys *fs, int excess)
 	return;
 }
 
-void mess_up_superblock_clusters_excess(ocfs2_filesys *fs, uint16_t slotnum)
+void mess_up_superblock_clusters_excess(ocfs2_filesys *fs, enum fsck_type type,
+					uint16_t slotnum)
 {
 	mess_up_superblock_clusters(fs, 1);
 }
 
-void mess_up_superblock_clusters_lack(ocfs2_filesys *fs, uint16_t slotnum)
+void mess_up_superblock_clusters_lack(ocfs2_filesys *fs, enum fsck_type type,
+				      uint16_t slotnum)
 {
 	mess_up_superblock_clusters(fs, 0);
 }
diff --git a/fswreck/include/chain.h b/fswreck/include/chain.h
index e08aac8..6edb4d5 100644
--- a/fswreck/include/chain.h
+++ b/fswreck/include/chain.h
@@ -25,14 +25,24 @@
 #ifndef __CHAIN_H__
 #define __CHAIN_H__
 
+#include "fsck_type.h"
+
 void mess_up_chains(ocfs2_filesys *fs, uint64_t blkno, int code);
-void mess_up_chains_list(ocfs2_filesys *fs,  uint16_t slotnum);
-void mess_up_chains_rec(ocfs2_filesys *fs,   uint16_t slotnum);
-void mess_up_chains_inode(ocfs2_filesys *fs, uint16_t slotnum);
-void mess_up_chains_group(ocfs2_filesys *fs, uint16_t slotnum);
-void mess_up_chains_group_magic(ocfs2_filesys *fs, uint16_t slotnum);
-void mess_up_chains_cpg(ocfs2_filesys *fs,  uint16_t slotnum);
-void mess_up_superblock_clusters_excess(ocfs2_filesys *fs,  uint16_t slotnum);
-void mess_up_superblock_clusters_lack(ocfs2_filesys *fs,  uint16_t slotnum);
+void mess_up_chains_list(ocfs2_filesys *fs, enum fsck_type type,
+			 uint16_t slotnum);
+void mess_up_chains_rec(ocfs2_filesys *fs, enum fsck_type type,
+			uint16_t slotnum);
+void mess_up_chains_inode(ocfs2_filesys *fs, enum fsck_type type,
+			  uint16_t slotnum);
+void mess_up_chains_group(ocfs2_filesys *fs, enum fsck_type type,
+			  uint16_t slotnum);
+void mess_up_chains_group_magic(ocfs2_filesys *fs, enum fsck_type type,
+				uint16_t slotnum);
+void mess_up_chains_cpg(ocfs2_filesys *fs, enum fsck_type type,
+			uint16_t slotnum);
+void mess_up_superblock_clusters_excess(ocfs2_filesys *fs, enum fsck_type type,
+					uint16_t slotnum);
+void mess_up_superblock_clusters_lack(ocfs2_filesys *fs, enum fsck_type type,
+				      uint16_t slotnum);
 
 #endif		/* __CHAIN_H__ */
-- 
1.5.5