Remove include/engine/quorum and integrate it into exec/engine.h

Signed-off-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

corosync.spec.in

@@ -277,8 +277,6 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/totem/totem.h
 %{_includedir}/corosync/totem/totemip.h
 %{_includedir}/corosync/totem/totempg.h
-%dir %{_includedir}/corosync/engine
-%{_includedir}/corosync/engine/quorum.h
 %{_libdir}/libcfg.so
 %{_libdir}/libcpg.so
 %{_libdir}/libcmap.so

exec/quorum.h

@@ -39,6 +39,10 @@ struct memb_ring_id;
 
 typedef void (*quorum_callback_fn_t) (int quorate, void *context);
 
+typedef void (*quorum_set_quorate_fn_t) (const unsigned int *view_list,
+                                         size_t view_list_entries,
+                                         int quorate, struct memb_ring_id *);
+
 struct quorum_callin_functions
 {
 	int (*quorate) (void);

exec/votequorum.c

@@ -42,11 +42,11 @@
 #include <qb/qbdefs.h>
 #include <qb/qbutil.h>
 
+#include "quorum.h"
 #include <corosync/corodefs.h>
 #include <corosync/list.h>
 #include <corosync/logsys.h>
 #include <corosync/coroapi.h>
-#include <corosync/engine/quorum.h>
 #include <corosync/icmap.h>
 #include <corosync/ipc_votequorum.h>
 

exec/votequorum.h

@@ -34,6 +34,7 @@
 #ifndef VOTEQUORUM_H_DEFINED
 #define VOTEQUORUM_H_DEFINED
 
+#include "quorum.h"
 #include <corosync/logsys.h>
 #include <corosync/list.h>
 #include <corosync/coroapi.h>

exec/vsf_quorum.c

@@ -54,6 +54,7 @@
 #include <sched.h>
 #include <time.h>
 
+#include "quorum.h"
 #include <corosync/corotypes.h>
 #include <qb/qbipc_common.h>
 #include <corosync/corodefs.h>
@@ -64,7 +65,6 @@
 #include <corosync/mar_gen.h>
 #include <corosync/coroapi.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/quorum.h>
 #include <corosync/icmap.h>
 
 #include "service.h"

exec/vsf_ykd.c

@@ -56,12 +56,12 @@
 #include <sched.h>
 #include <time.h>
 
+#include "quorum.h"
 #include <corosync/logsys.h>
 #include <corosync/corotypes.h>
 #include <qb/qbipc_common.h>
 #include <corosync/mar_gen.h>
 #include <corosync/coroapi.h>
-#include <corosync/engine/quorum.h>
 #include <corosync/swab.h>
 
 #include "vsf_ykd.h"

exec/vsf_ykd.h

@@ -34,6 +34,7 @@
 #ifndef VFS_YKD_H_DEFINED
 #define VFS_YKD_H_DEFINED
 
+#include "quorum.h"
 #include <corosync/logsys.h>
 #include <corosync/list.h>
 #include <corosync/coroapi.h>

include/Makefile.am

@@ -38,13 +38,10 @@ CS_INTERNAL_H		= ipc_cfg.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h 	\
 			jhash.h pload.h quorum.h sq.h ipc_votequorum.h ipc_cmap.h \
 			logsys.h coroapi.h icmap.h mar_gen.h list.h swab.h
 
-ENGINE_H		= quorum.h
-
 TOTEM_H			= totem.h totemip.h totempg.h
 
 EXTRA_DIST 		= $(noinst_HEADERS)
 
 noinst_HEADERS          = $(CS_INTERNAL_H:%=corosync/%)
 
-nobase_include_HEADERS	= $(CS_H:%=corosync/%) \
-			$(ENGINE_H:%=corosync/engine/%) $(TOTEM_H:%=corosync/totem/%)
+nobase_include_HEADERS	= $(CS_H:%=corosync/%) $(TOTEM_H:%=corosync/totem/%)

include/corosync/coroapi.h

@@ -163,10 +163,9 @@ typedef enum {
 #ifndef QUORUM_H_DEFINED
 typedef void (*quorum_callback_fn_t) (int quorate, void *context);
 
-struct quorum_callin_functions
-{
+struct quorum_callin_functions {
 	int (*quorate) (void);
-	int (*register_callback) (quorum_callback_fn_t callback_fn, void *context);
+	int (*register_callback) (quorum_callback_fn_t callback_fn, void *contexxt);
 	int (*unregister_callback) (quorum_callback_fn_t callback_fn, void *context);
 };
 
@@ -178,6 +177,7 @@ typedef void (*sync_callback_fn_t) (
 
 #endif /* QUORUM_H_DEFINED */
 
+
 struct corosync_api_v1 {
 	/*
 	 * Time and timer APIs

include/corosync/engine/quorum.h

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2008, 2009 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Christine Caulfield (ccaulfie@redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the Red Hat Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef QUORUM_H_DEFINED
-#define QUORUM_H_DEFINED
-
-typedef void (*quorum_set_quorate_fn_t) (const unsigned int *view_list,
-					 size_t view_list_entries,
-					 int quorate, struct memb_ring_id *);
-
-struct quorum_services_api_ver1 {
-	void (*init) (struct corosync_api_v1 *api, quorum_set_quorate_fn_t);
-};
-#endif /* QUORUM_H_DEFINED */