Просмотр исходного кода

This patch removes the (now redundant) call to sync_primary_callback_fn
when quorum changes.

As we established a while ago, quorum is independent of sync and all
this code does is segfault when called!



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2131 fd59a12c-fef9-0310-b244-a6a79926bd2f

Christine Caulfield 17 лет назад
Родитель
Сommit
4bfbee7dd8
1 измененных файлов с 0 добавлено и 12 удалено
  1. 0 12
      exec/vsf_quorum.c

+ 0 - 12
exec/vsf_quorum.c

@@ -106,12 +106,6 @@ static size_t quorum_view_list_entries = 0;
 static int quorum_view_list[PROCESSOR_COUNT_MAX];
 static int quorum_view_list[PROCESSOR_COUNT_MAX];
 struct quorum_services_api_ver1 *quorum_iface = NULL;
 struct quorum_services_api_ver1 *quorum_iface = NULL;
 
 
-static void (*sync_primary_callback_fn) (
-	const unsigned int *view_list,
-	size_t view_list_entries,
-	int primary_designated,
-	struct memb_ring_id *ring_id);
-
 /* Internal quorum API function */
 /* Internal quorum API function */
 static void quorum_api_set_quorum(const unsigned int *view_list,
 static void quorum_api_set_quorum(const unsigned int *view_list,
 				  size_t view_list_entries,
 				  size_t view_list_entries,
@@ -126,12 +120,6 @@ static void quorum_api_set_quorum(const unsigned int *view_list,
 	}
 	}
 
 
 	quorum_view_list_entries = view_list_entries;
 	quorum_view_list_entries = view_list_entries;
-
-	/* Tell sync() only if there is a new ring_id (ie this is not a 'fake' quorum event) */
-	if (memcmp(&quorum_ring_id, ring_id, sizeof (quorum_ring_id))) {
-		sync_primary_callback_fn(view_list, view_list_entries,
-					 primary_designated, ring_id);
-	}
 	memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id));
 	memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id));
 	memcpy(quorum_view_list, view_list, sizeof(unsigned int)*view_list_entries);
 	memcpy(quorum_view_list, view_list, sizeof(unsigned int)*view_list_entries);