From: Jackie Huang <jackie.hu...@windriver.com>
message_handler_req_exec_lck_resourceclose is to remove cleanup
entry from corosync. Now this job is done by pacemaker. So remove
this feature from openais.
Signed-off-by: yanjun.zhu <yanjun....@windriver.com>
Signed-off-by: Jackie Huang <jackie.hu...@windriver.com>
---
.../files/openais-fix-resource-cleanup-entry.patch | 37 ++++++++++++++++++++++
.../recipes-cgl/openais/openais_1.1.4.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644
meta-cgl-common/recipes-cgl/openais/files/openais-fix-resource-cleanup-entry.patch
diff --git
a/meta-cgl-common/recipes-cgl/openais/files/openais-fix-resource-cleanup-entry.patch
b/meta-cgl-common/recipes-cgl/openais/files/openais-fix-resource-cleanup-entry.patch
new file mode 100644
index 0000000..55313ce
--- /dev/null
+++
b/meta-cgl-common/recipes-cgl/openais/files/openais-fix-resource-cleanup-entry.patch
@@ -0,0 +1,37 @@
+commit f70bea251f21a8bd646e59b34e6f74f6ee3fe29b
+Author: yanjun.zhu <yanjun....@windriver.com>
+Date: Tue Mar 19 12:23:55 2013 +0800
+
+ openais: remove cleanup entry from openais
+
+ message_handler_req_exec_lck_resourceclose is to remove cleanup
+ entry from corosync. Now this job is done by pacemaker. So remove
+ this feature from openais.
+
+ Upstream-Status: Pending
+
+ Signed-off-by: yanjun.zhu <yanjun....@windriver.com>
+
+diff -urpN a/services/lck.c b/services/lck.c
+--- a/services/lck.c
++++ b/services/lck.c
+@@ -2304,17 +2304,9 @@ error_exit:
+
+ if (error == SA_AIS_OK) {
+ /*
+- * Remove the cleanup entry for this resource.
++ * cleanup entry for this resource can not be removed.
++ * This will be done by pacemaker.
+ */
+- cleanup = lck_resource_cleanup_find (
+- req_exec_lck_resourceclose->source.conn,
+- &req_exec_lck_resourceclose->resource_name);
+-
+- if (cleanup != NULL) {
+- list_del (&cleanup->cleanup_list);
+- free (cleanup);
+- }
+-
+ hdb_handle_put (&resource_hdb,
req_exec_lck_resourceclose->resource_id);
+ hdb_handle_destroy (&resource_hdb,
req_exec_lck_resourceclose->resource_id);
+ }
diff --git a/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
b/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
index 9cc750a..cdf1454 100644
--- a/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
+++ b/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
@@ -12,6 +12,7 @@ SRC_URI = " \
file://openais-fix-init-script.patch \
file://openais-saTmrTimerReschedule-test-error.patch \
file://openais-fix-corosync-not-quit.patch \
+ file://openais-fix-resource-cleanup-entry.patch \
file://openais.service \
"
--
2.11.0
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
