[Debian-ha-commits] [cluster-glue] 72/73: Dropped raexecupstart.patch as it is not needed any longer

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit 47da59faf53ccff168ebda5ea7dbfedcf436ed80
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 17 09:24:24 2015 -0400

    Dropped raexecupstart.patch as it is not needed any longer
    
    Change-Id: I46f129cf52bfccd034f2c6cc07adb388c85a61b9
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/patches/raexecupstart.patch | 41 --------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/debian/patches/raexecupstart.patch b/debian/patches/raexecupstart.patch
deleted file mode 100644
index f72c9de..0000000
--- a/debian/patches/raexecupstart.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c
---- Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c	2011-10-19 15:18:06.000000000 +0000
-+++ Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c	2011-10-20 09:26:43.385459974 +0000
-@@ -1533,6 +1533,28 @@
- 	lrmd_client_t* client = (lrmd_client_t*) user_data;
- 
- 	CHECK_ALLOCATED(client, "client", );
-+
-+	/* If we've been called as a result of g_src and/or
-+	 * g_src_cbk being unreffed, don't try to unref it
-+	 * again, as that'll deadlock. OTOH, we might have
-+	 * introduced a leak here. */
-+#if 0
-+	if (client->g_src != NULL) {
-+		G_main_del_IPC_Channel(client->g_src);
-+	}
-+
-+	if (client->g_src_cbk != NULL) {
-+		G_main_del_IPC_Channel(client->g_src_cbk);
-+	}
-+#endif
-+	lrmd_client_destroy(client);
-+
-+}
-+
-+static void
-+remove_client (lrmd_client_t *client)
-+{
-+	CHECK_ALLOCATED(client, "client", );
- 	if (client->g_src != NULL) {
- 		G_main_del_IPC_Channel(client->g_src);
- 	}
-@@ -1617,7 +1639,7 @@
- 	exist = lookup_client(client->pid);
- 	if (NULL != exist) {
- 		g_hash_table_remove(clients, (gpointer)&client->pid);
--		on_remove_client(exist);
-+		remove_client(exist);
- 		lrmd_log(LOG_NOTICE,
- 			"on_msg_register: the client [pid:%d] already exists in "
- 			"internal client list, let remove it at first."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git



More information about the Debian-HA-Commits mailing list