mirror of
https://git.proxmox.com/git/mirror_corosync
synced 2025-07-26 22:18:03 +00:00
quorum: link ykd back into quorum and fix build warning
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> Reviewed-by: Angus Salkeld <asalked@redhat.com>
This commit is contained in:
parent
b9af50474e
commit
0e2f0b872b
@ -67,7 +67,9 @@
|
||||
#include <corosync/engine/quorum.h>
|
||||
#include <corosync/icmap.h>
|
||||
|
||||
#include "service.h"
|
||||
#include "votequorum.h"
|
||||
#include "vsf_ykd.h"
|
||||
|
||||
LOGSYS_DECLARE_SUBSYS ("QUORUM");
|
||||
|
||||
@ -278,6 +280,11 @@ static int quorum_exec_init_fn (struct corosync_api_v1 *api)
|
||||
quorum_type = 1;
|
||||
}
|
||||
}
|
||||
if (strcmp (quorum_module, "corosync_ykd") == 0) {
|
||||
if (ykd_init (api, quorum_api_set_quorum) == CS_OK) {
|
||||
quorum_type = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (quorum_module) {
|
||||
|
@ -64,6 +64,8 @@
|
||||
#include <corosync/engine/quorum.h>
|
||||
#include <corosync/swab.h>
|
||||
|
||||
#include "vsf_ykd.h"
|
||||
|
||||
LOGSYS_DECLARE_SUBSYS ("YKD");
|
||||
|
||||
#define YKD_PROCESSOR_COUNT_MAX 32
|
||||
@ -506,13 +508,17 @@ struct corosync_tpg_group ykd_group = {
|
||||
.group_len = 3
|
||||
};
|
||||
|
||||
static void ykd_init (
|
||||
cs_error_t ykd_init (
|
||||
struct corosync_api_v1 *corosync_api,
|
||||
quorum_set_quorate_fn_t set_primary)
|
||||
{
|
||||
ykd_primary_callback_fn = set_primary;
|
||||
api = corosync_api;
|
||||
|
||||
if ((!corosync_api) || (!set_primary)) {
|
||||
return CS_ERR_INVALID_PARAM;
|
||||
}
|
||||
|
||||
api->tpg_init (
|
||||
&ykd_group_handle,
|
||||
ykd_deliver_fn,
|
||||
@ -524,4 +530,6 @@ static void ykd_init (
|
||||
1);
|
||||
|
||||
ykd_state_init ();
|
||||
|
||||
return CS_OK;
|
||||
}
|
||||
|
44
exec/vsf_ykd.h
Normal file
44
exec/vsf_ykd.h
Normal file
@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright (c) 2012 Red Hat, Inc.
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Author: Fabio M. Di Nitto (fdinitto@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 MontaVista Software, 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 VFS_YKD_H_DEFINED
|
||||
#define VFS_YKD_H_DEFINED
|
||||
|
||||
#include <corosync/logsys.h>
|
||||
#include <corosync/list.h>
|
||||
#include <corosync/coroapi.h>
|
||||
|
||||
extern cs_error_t ykd_init(struct corosync_api_v1 *api,
|
||||
quorum_set_quorate_fn_t set_primary);
|
||||
|
||||
#endif /* VFS_YKD_H_DEFINED */
|
Loading…
Reference in New Issue
Block a user