[Cluster-devel] cluster/cmirror/src functions.c local.c

[Cluster-devel] cluster/cmirror/src functions.c local.c

[jbrassow]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	jbrassow at sourceware.org	2008-01-15 22:01:18

Modified files:
	cmirror/src    : functions.c local.c 

Log message:
	- a 'return' instead of a 'goto' was skipping over some key initialization,
	causing core logged cluster mirrors not to work
	
	Bug #385001

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/functions.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.7&r2=1.1.2.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/local.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.6&r2=1.1.2.7

--- cluster/cmirror/src/Attic/functions.c	2008/01/14 22:52:17	1.1.2.7
+++ cluster/cmirror/src/Attic/functions.c	2008/01/15 22:01:18	1.1.2.8
@@ -724,7 +724,7 @@
 		return -EINVAL;
 
 	if (lc->disk_fd == -1)
-		return 0;
+		goto out;
 
 	switch (lc->resume_override) {
 	case 1000:
--- cluster/cmirror/src/Attic/local.c	2008/01/14 22:52:17	1.1.2.6
+++ cluster/cmirror/src/Attic/local.c	2008/01/15 22:01:18	1.1.2.7
@@ -151,8 +151,8 @@
 	if (r)
 		return r;
 
-	LOG_DBG("Request from kernel recieved [%s/%llu]",
-		RQ_TYPE(tfr->request_type), tfr->seq);
+	LOG_DBG("Request from kernel recieved [%s/%s/%llu]",
+		RQ_TYPE(tfr->request_type), SHORT_UUID(tfr->uuid), tfr->seq);
 	switch (tfr->request_type) {
 	case DM_CLOG_CTR:
 	case DM_CLOG_DTR: