Re: [linux-lvm] Re: Patch to clvmd-openais.c again

["Xinwei Hu" <hxinwei@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

> Your patch has now been included in upstream clvmd.

Thanks for the inclusion.

And here are another 2:
. remove_lock_wait.diff remove the definition of "struct lock_wait",
which is not used since the switch away from async version saLck
. num_nodes should equal to member_list_entries, i.e.
joined_list_entires is 0 when a node leaves the group.

Would you help review them ;)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: remove_lock_wait.diff --]
[-- Type: text/x-patch; name=remove_lock_wait.diff, Size: 391 bytes --]

--- clvmd-openais.c.orig	2008-04-28 21:53:46.000000000 +0800
+++ clvmd-openais.c	2008-04-28 21:53:53.000000000 +0800
@@ -100,13 +100,6 @@
 	SaNameT              lock_name;
 };
 
-struct lock_wait
-{
-	pthread_cond_t cond;
-	pthread_mutex_t mutex;
-	int status;
-};
-
 /* Set errno to something approximating the right value and return 0 or -1 */
 static int ais_to_errno(SaAisErrorT err)
 {

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: num_nodes_fix.diff --]
[-- Type: text/x-patch; name=num_nodes_fix.diff, Size: 322 bytes --]

--- clvmd-openais.c.orig	2008-04-28 21:53:53.000000000 +0800
+++ clvmd-openais.c	2008-04-28 22:03:05.000000000 +0800
@@ -306,7 +306,7 @@
 		ninfo->state = NODE_CLVMD;
 	}
 
-	num_nodes = joined_list_entries;
+	num_nodes = member_list_entries;
 }
 
 static int lck_dispatch(struct local_client *client, char *buf, int len,