[Sheepdog] [PATCH v3 7/7] sheep: transient failure - change some names to rebase codes

yaohaiting.wujue at gmail.com yaohaiting.wujue at gmail.com
Wed May 2 09:12:55 CEST 2012


From: HaiTing Yao <wujue.yht at taobao.com>

Since my work, some names of structure and function have been
changed. Change the names to rebase codes

Signed-off-by: HaiTing Yao <wujue.yht at taobao.com>
---
 sheep/group.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sheep/group.c b/sheep/group.c
index 075101e..17b973f 100644
--- a/sheep/group.c
+++ b/sheep/group.c
@@ -1312,7 +1312,7 @@ static void temp_failure_timeout(void *data)
 	int size;
 	int found = -1;
 	char ipstr[INET6_ADDRSTRLEN];
-	struct cpg_event *cevent = NULL;
+	struct event_struct *cevent = NULL;
 	struct work_leave *w = NULL;
 	struct temp_failure *leave_timer = NULL;
 	struct sd_node *leave_node = NULL;
@@ -1333,7 +1333,7 @@ static void temp_failure_timeout(void *data)
 		panic("failed to allocate memory for a confchg event\n");
 
 	cevent = &w->cev;
-	cevent->ctype = CPG_EVENT_LEAVE;
+	cevent->ctype = EVENT_LEAVE;
 
 	size = sizeof(struct sd_node) * (sys->nr_nodes - 1);
 	w->member_list = zalloc(size);
@@ -1374,8 +1374,8 @@ static void temp_failure_timeout(void *data)
 	if (sys->cdrv->remove_node)
 		sys->cdrv->remove_node(leave_node);
 
-	list_add_tail(&cevent->cpg_event_list, &sys->cpg_event_siblings);
-	start_cpg_event_work();
+	list_add_tail(&cevent->event_list, &sys->event_queue);
+	process_request_event_queues();
 
 	unregister_event(cdrv_fd);
 
-- 
1.7.1




More information about the sheepdog mailing list