gfs2-utils: master - gfs_controld: Remove some unused code

[Steven Whitehouse <swhiteho@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=7a5b9055ce63203dfe355d81bb98d1a00d6234b4
Commit:        7a5b9055ce63203dfe355d81bb98d1a00d6234b4
Parent:        60d5d7cbd26888177653a766bd476c307b091074
Author:        Steven Whitehouse <swhiteho@redhat.com>
AuthorDate:    Wed Jul 22 18:36:29 2009 +0100
Committer:     Steven Whitehouse <swhiteho@redhat.com>
CommitterDate: Wed Jul 22 18:36:29 2009 +0100

gfs_controld: Remove some unused code

There were three hunks of unused code in gfs_controld. One can be
enabled since its only debugging. One is really documentation, so
the comment has been updated to explain why its still there. The
third is also really documentation, and also updated.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 group/gfs_controld/cpg-new.c     |    8 ++++----
 group/gfs_controld/member_cman.c |   15 +++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c
index 399ac16..7d71712 100644
--- a/group/gfs_controld/cpg-new.c
+++ b/group/gfs_controld/cpg-new.c
@@ -1755,7 +1755,6 @@ static void create_new_nodes(struct mountgroup *mg)
 	}
 }
 
-#if 0
 static void print_id_list(struct mountgroup *mg, struct id_info *ids,
 			  int id_count, int id_size)
 {
@@ -1768,7 +1767,6 @@ static void print_id_list(struct mountgroup *mg, struct id_info *ids,
 		id = (struct id_info *)((char *)id + id_size);
 	}
 }
-#endif
 
 static void create_failed_journals(struct mountgroup *mg)
 {
@@ -1783,7 +1781,7 @@ static void create_failed_journals(struct mountgroup *mg)
 		log_group(mg, "create_failed_journals all new");
 		return;
 	}
-	/* print_id_list(mg, ids, id_count, id_size); */
+	print_id_list(mg, ids, id_count, id_size);
 
 	id = ids;
 
@@ -2248,7 +2246,9 @@ static int pick_journal_to_recover(struct mountgroup *mg, int *jid)
 
 #if 0
 	/* FIXME: do something so this doesn't happen so regularly; maybe
-	   retry only after all nodes have failed */
+	 * retry only after all nodes have failed. This code doesn't work
+	 * but shows an idea of roughly how to fix the issue.
+	 */
 
 	/* Retry recoveries that failed the first time.  This is necessary
 	   at times for withrawn journals when all nodes fail the recovery
diff --git a/group/gfs_controld/member_cman.c b/group/gfs_controld/member_cman.c
index 384fab0..16631d3 100644
--- a/group/gfs_controld/member_cman.c
+++ b/group/gfs_controld/member_cman.c
@@ -84,12 +84,11 @@ void close_cluster_cfg(void)
 	corosync_cfg_finalize(ch);
 }
 
-/* what's the replacement for this? */
-#if 0
-	case CMAN_REASON_CONFIG_UPDATE:
-		setup_logging();
-		setup_ccs();
-		break;
-	}
-#endif
+/* what's the replacement for this?
+ *	case CMAN_REASON_CONFIG_UPDATE:
+ *		setup_logging();
+ *		setup_ccs();
+ *		break;
+ *	}
+ */