api: Change some of totempg definitons

Recent changes in patch "Get rid of hdb usage in totempg.h interface"
caused incompatibility between corosync API and totempg.

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

diff --git a/exec/apidef.c b/exec/apidef.c
index 479b797088ba622fff9b59bfa2df9f495d17d475..2d0b6cd7ad9ab74e25d58f5328042686ef61f7ce 100644 (file)
--- a/exec/apidef.c
+++ b/exec/apidef.c
@@ -63,23 +63,23 @@ LOGSYS_DECLARE_SUBSYS ("APIDEF");
  * Remove compile warnings about type name changes in corosync_tpg_group
  */
 typedef int (*typedef_tpg_join) (
-       hdb_handle_t,
+       void *,
        const struct corosync_tpg_group *,
        size_t);
 
-typedef int (*typedef_tpg_leave) (hdb_handle_t,
+typedef int (*typedef_tpg_leave) (void *,
        const struct corosync_tpg_group *,
        size_t);
 
 typedef int (*typedef_tpg_groups_mcast_groups) (
-       hdb_handle_t, int,
+       void *, int,
        const struct corosync_tpg_group *,
        size_t groups_cnt,
        const struct iovec *,
        unsigned int);
 
 typedef int (*typedef_tpg_groups_send_ok) (
-       hdb_handle_t,
+       void *,
        const struct corosync_tpg_group *,
        size_t groups_cnt,
        struct iovec *,

diff --git a/exec/vsf_ykd.c b/exec/vsf_ykd.c
index ccc26c63d16d17a224d1548dd337897c643bbeed..3e3dfa8a518d6ea99d73fc1c8dfb50ac4c52b7d4 100644 (file)
--- a/exec/vsf_ykd.c
+++ b/exec/vsf_ykd.c
@@ -111,7 +111,7 @@ struct state_received {
 
 struct ykd_state ykd_state;
 
-static hdb_handle_t ykd_group_handle;
+static void *ykd_group_handle;
 
 static struct state_received state_received_confchg[YKD_PROCESSOR_COUNT_MAX];
 

diff --git a/include/corosync/engine/coroapi.h b/include/corosync/engine/coroapi.h
index c1a6de5bda234287f23ec519600da1b1f767c356..567d14f99d51ee8755dcd59a1f04faea9a72f13f 100644 (file)
--- a/include/corosync/engine/coroapi.h
+++ b/include/corosync/engine/coroapi.h
@@ -483,7 +483,7 @@ struct corosync_api_v1 {
         * wanting their own groups
         */
        int (*tpg_init) (
-               hdb_handle_t *handle,
+               void **instance,
 
                void (*deliver_fn) (
                        unsigned int nodeid,
@@ -502,26 +502,26 @@ struct corosync_api_v1 {
                        const struct memb_ring_id *ring_id));
 
        int (*tpg_exit) (
-                       hdb_handle_t handle);
+               void *instance);
 
        int (*tpg_join) (
-               hdb_handle_t handle,
+               void *instance,
                const struct corosync_tpg_group *groups,
                size_t group_cnt);
 
        int (*tpg_leave) (
-               hdb_handle_t handle,
+               void *instance,
                const struct corosync_tpg_group *groups,
                size_t group_cnt);
 
        int (*tpg_joined_mcast) (
-               hdb_handle_t handle,
+               void *totempg_groups_instance,
                const struct iovec *iovec,
                unsigned int iov_len,
                int guarantee);
 
        int (*tpg_joined_reserve) (
-               hdb_handle_t handle,
+               void *totempg_groups_instance,
                const struct iovec *iovec,
                unsigned int iov_len);
 
@@ -529,7 +529,7 @@ struct corosync_api_v1 {
                int reserved_msgs);
 
        int (*tpg_groups_mcast) (
-               hdb_handle_t handle,
+               void *instance,
                int guarantee,
                const struct corosync_tpg_group *groups,
                size_t groups_cnt,
@@ -537,7 +537,7 @@ struct corosync_api_v1 {
                unsigned int iov_len);
 
        int (*tpg_groups_reserve) (
-               hdb_handle_t handle,
+               void *instance,
                const struct corosync_tpg_group *groups,
                size_t groups_cnt,
                const struct iovec *iovec,