diff options
| author | Jonathan Earl Brassow <jbrassow@redhat.com> | 2012-03-01 17:41:39 +0000 |
|---|---|---|
| committer | Jonathan Earl Brassow <jbrassow@redhat.com> | 2012-03-01 17:41:39 +0000 |
| commit | 2ce9693341416b5072e6491da39adcbd3c5d6899 (patch) | |
| tree | 41694dea9411ceffee8b3808c4bee1cbd32fa325 /daemons | |
| parent | d17cd1c385a33bcf68eca528eef1d063f65ccb09 (diff) | |
| download | lvm2-2ce9693341416b5072e6491da39adcbd3c5d6899.tar.gz lvm2-2ce9693341416b5072e6491da39adcbd3c5d6899.tar.xz lvm2-2ce9693341416b5072e6491da39adcbd3c5d6899.zip | |
s/CPG_/CS_: Various CPG constants are going away, even though CPG itself stays
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
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/cmirrord/cluster.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/daemons/cmirrord/cluster.c b/daemons/cmirrord/cluster.c index f56cb816..f7b43b55 100644 --- a/daemons/cmirrord/cluster.c +++ b/daemons/cmirrord/cluster.c @@ -197,7 +197,7 @@ int cluster_send(struct clog_request *rq) #else r = cpg_mcast_joined(entry->handle, CPG_TYPE_AGREED, &iov, 1); #endif - if (r == CPG_OK) + if (r == CS_OK) return 0; /* 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))) { - int r = CPG_OK; + int r = CS_OK; struct clog_cpg *entry, *tmp; dm_list_iterate_items_safe(entry, tmp, &clog_cpg_list) { - r = cpg_dispatch(entry->handle, CPG_DISPATCH_ALL); - if (r != CPG_OK) + r = cpg_dispatch(entry->handle, CS_DISPATCH_ALL); + if (r != CS_OK) LOG_ERROR("cpg_dispatch failed: %d", r); if (entry->free_me) { @@ -957,7 +957,7 @@ static int do_cluster_work(void *data __attribute__((unused))) 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) @@ -1585,14 +1585,14 @@ int create_cluster_cpg(char *uuid, uint64_t luid) SHORT_UUID(new->name.value)); r = cpg_initialize(&new->handle, &cpg_callbacks); - if (r != CPG_OK) { + if (r != CS_OK) { LOG_ERROR("cpg_initialize failed: Cannot join cluster"); free(new); return -EPERM; } r = cpg_join(new->handle, &new->name); - if (r != CPG_OK) { + if (r != CS_OK) { LOG_ERROR("cpg_join failed: Cannot join cluster"); free(new); return -EPERM; @@ -1665,7 +1665,7 @@ static int _destroy_cluster_cpg(struct clog_cpg *del) abort_startup(del); r = cpg_leave(del->handle, &del->name); - if (r != CPG_OK) + if (r != CS_OK) LOG_ERROR("Error leaving CPG!"); return 0; } |