[Cluster-devel] cluster/rgmanager/src/clulib vft.c

[Cluster-devel] cluster/rgmanager/src/clulib vft.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-03-28 15:54:48

Modified files:
	rgmanager/src/clulib: vft.c 

Log message:
	Fix SPARC / HPPA build; patch from Fabio M. Di Nitto

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/vft.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17&r2=1.17.2.1

--- cluster/rgmanager/src/clulib/vft.c	2006/10/23 22:47:00	1.17
+++ cluster/rgmanager/src/clulib/vft.c	2007/03/28 14:54:47	1.17.2.1
@@ -726,8 +726,13 @@
 	if (!fp)
 		return -1;
 
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+		    &junk.tv_sec, &junk.tv_usec);
+#else
 	rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
+#endif
 	fclose(fp);
 	
 	if (rv != 4) {

[Cluster-devel] cluster/rgmanager/src/clulib vft.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-11-14 16:56:50

Modified files:
	rgmanager/src/clulib: vft.c 

Log message:
	Fix #303981 - crash on restart

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/vft.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.3&r2=1.17.2.4

--- cluster/rgmanager/src/clulib/vft.c	2007/07/24 13:53:08	1.17.2.3
+++ cluster/rgmanager/src/clulib/vft.c	2007/11/14 16:56:50	1.17.2.4
@@ -1368,6 +1368,7 @@
 {
 	vf_msg_t *hdrp;
 	int ret;
+	key_node_t *kn;
 
 	if ((nbytes <= 0) || (nbytes < sizeof(generic_msg_hdr)) ||
 	    (msgp->gh_command != VF_MESSAGE))
@@ -1422,8 +1423,13 @@
 #endif
 		pthread_mutex_lock(&key_list_mutex);
 		vf_buffer_commit(msgp->gh_arg2);
-		ret = (vf_resolve_views(kn_find_trans(msgp->gh_arg2)) ?
-			VFR_COMMIT : VFR_OK);
+		kn = kn_find_trans(msgp->gh_arg2);
+		if (!kn) {
+			pthread_mutex_unlock(&key_list_mutex);
+			return VFR_OK;
+		}
+
+		ret = (vf_resolve_views(kn) ? VFR_COMMIT : VFR_OK);
 		pthread_mutex_unlock(&key_list_mutex);
 		return ret;
 

[Cluster-devel] cluster/rgmanager/src/clulib vft.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	lhh at sourceware.org	2007-03-28 15:55:30

Modified files:
	rgmanager/src/clulib: vft.c 

Log message:
	Fix SPARC / HPPA build; patch from Fabio M. Di Nitto

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/vft.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.7.2.3.6.4&r2=1.7.2.3.6.5

--- cluster/rgmanager/src/clulib/vft.c	2007/01/22 23:10:01	1.7.2.3.6.4
+++ cluster/rgmanager/src/clulib/vft.c	2007/03/28 14:55:30	1.7.2.3.6.5
@@ -768,8 +768,13 @@
 	if (!fp)
 		return -1;
 
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+		    &junk.tv_sec, &junk.tv_usec);
+#else
 	rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
+#endif
 	fclose(fp);
 	
 	if (rv != 4) {

[Cluster-devel] cluster/rgmanager/src/clulib vft.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-03-28 15:54:12

Modified files:
	rgmanager/src/clulib: vft.c 

Log message:
	Fix SPARC / HPPA build; patch from Fabio M. Di Nitto

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/vft.c.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- cluster/rgmanager/src/clulib/vft.c	2007/03/27 19:33:20	1.18
+++ cluster/rgmanager/src/clulib/vft.c	2007/03/28 14:54:12	1.19
@@ -731,8 +731,13 @@
 	if (!fp)
 		return -1;
 
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+		    &junk.tv_sec, &junk.tv_usec);
+#else
 	rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
+#endif
 	fclose(fp);
 	
 	if (rv != 4) {