shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

s/CPG_/CS_: Various CPG constants are going away, even though CPG itself stays

Browse Source 
F17 is getting rid of OpenAIS libraries (and checkpointing).  While the
CPG stuff is staying, some if its constants are being removed.  So, we
must adjust and use the remaining constants which the CPG constants were based on.

[~]# egrep 'CPG_DISPATCH_ALL|CPG_OK' /usr/include/*/*
corosync/corotypes.h:#define CPG_DISPATCH_ALL     CS_DISPATCH_ALL
corosync/corotypes.h:#define CPG_OK               CS_OK
This commit is contained in:
Jonathan Earl Brassow 2012-03-01 17:41:39 +00:00
parent d17cd1c385
commit 2ce9693341
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemons/cmirrord/cluster.c
View File

@ -197,7 +197,7 @@ int cluster_send(struct clog_request *rq)
#else #else
r = cpg_mcast_joined(entry->handle, CPG_TYPE_AGREED, &iov, 1); r = cpg_mcast_joined(entry->handle, CPG_TYPE_AGREED, &iov, 1);
#endif #endif
if (r == CPG_OK) if (r == CS_OK)
return 0; return 0;
/* error codes found in openais/cpg.h */ /* error codes found in openais/cpg.h */
@ -940,12 +940,12 @@ static int resend_requests(struct clog_cpg *entry)
static int do_cluster_work(void *data __attribute__((unused))) static int do_cluster_work(void *data __attribute__((unused)))
{ {
int r = CPG_OK; int r = CS_OK;
struct clog_cpg *entry, *tmp; struct clog_cpg *entry, *tmp;
dm_list_iterate_items_safe(entry, tmp, &clog_cpg_list) { dm_list_iterate_items_safe(entry, tmp, &clog_cpg_list) {
r = cpg_dispatch(entry->handle, CPG_DISPATCH_ALL); r = cpg_dispatch(entry->handle, CS_DISPATCH_ALL);
if (r != CPG_OK) if (r != CS_OK)
LOG_ERROR("cpg_dispatch failed: %d", r); LOG_ERROR("cpg_dispatch failed: %d", r);
if (entry->free_me) { if (entry->free_me) {
@ -957,7 +957,7 @@ static int do_cluster_work(void *data __attribute__((unused)))
resend_requests(entry); resend_requests(entry);
} }
return (r == CPG_OK) ? 0 : -1; /* FIXME: good error number? */ return (r == CS_OK) ? 0 : -1; /* FIXME: good error number? */
} }
static int flush_startup_list(struct clog_cpg *entry) static int flush_startup_list(struct clog_cpg *entry)
@ -1585,14 +1585,14 @@ int create_cluster_cpg(char *uuid, uint64_t luid)
SHORT_UUID(new->name.value)); SHORT_UUID(new->name.value));
r = cpg_initialize(&new->handle, &cpg_callbacks); r = cpg_initialize(&new->handle, &cpg_callbacks);
if (r != CPG_OK) { if (r != CS_OK) {
LOG_ERROR("cpg_initialize failed: Cannot join cluster"); LOG_ERROR("cpg_initialize failed: Cannot join cluster");
free(new); free(new);
return -EPERM; return -EPERM;
} }
r = cpg_join(new->handle, &new->name); r = cpg_join(new->handle, &new->name);
if (r != CPG_OK) { if (r != CS_OK) {
LOG_ERROR("cpg_join failed: Cannot join cluster"); LOG_ERROR("cpg_join failed: Cannot join cluster");
free(new); free(new);
return -EPERM; return -EPERM;
@ -1665,7 +1665,7 @@ static int _destroy_cluster_cpg(struct clog_cpg *del)
abort_startup(del); abort_startup(del);
r = cpg_leave(del->handle, &del->name); r = cpg_leave(del->handle, &del->name);
if (r != CPG_OK) if (r != CS_OK)
LOG_ERROR("Error leaving CPG!"); LOG_ERROR("Error leaving CPG!");
return 0; return 0;
} }