[Cluster-devel] cluster/cmirror-kernel/src dm-cmirror-client.c ...

[jbrassow at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	jbrassow at sourceware.org	2007-01-08 19:28:26

Modified files:
	cmirror-kernel/src: dm-cmirror-client.c dm-cmirror-server.c 

Log message:
	Now that the kernel is correctly handling sync state change, we can
	remove the workaround in cmirror (keeping sync_count vs. decrementing
	it).
	
	Also moved some print statements to reduce console ouput.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/dm-cmirror-client.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.33&r2=1.1.2.34
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/dm-cmirror-server.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.18&r2=1.1.2.19

--- cluster/cmirror-kernel/src/Attic/dm-cmirror-client.c	2006/12/07 18:58:32	1.1.2.33
+++ cluster/cmirror-kernel/src/Attic/dm-cmirror-client.c	2007/01/08 19:28:26	1.1.2.34
@@ -961,21 +961,20 @@
 			continue;
 		}
 
-		DMWARN("unable to get server (%u) to mark region (%Lu)",
-		       lc->server_id, region);
-		DMWARN("Reason :: %d", error);
-
 		if (error == -EIO) {
 			lc->log_dev_failed = 1;
 			break;
 		}
+		DMWARN("unable to get server (%u) to mark region (%Lu)",
+		       lc->server_id, region);
+		DMWARN("Reason :: %d", error);
 	}
 
 	if (lc->log_dev_failed) {
-		DMERR("Write failed on mirror log device, %s",
-		      lc->log_dev->name);
 		dm_table_event(lc->ti->table);
 		/*
+		DMERR("Write failed on mirror log device, %s",
+		      lc->log_dev->name);
 		if (!atomic_read(&lc->suspended))
 			wait_for_completion(&lc->failure_completion);
 		*/
--- cluster/cmirror-kernel/src/Attic/dm-cmirror-server.c	2006/12/07 18:58:32	1.1.2.18
+++ cluster/cmirror-kernel/src/Attic/dm-cmirror-server.c	2007/01/08 19:28:26	1.1.2.19
@@ -516,8 +516,6 @@
 			lc->touched = 0;
 			lc->log_dev_failed = 0;
 		} else {
-			DMERR("Mark region failed (%d) on mirror log device, %s",
-			      r, lc->log_dev->name);
 			lc->log_dev_failed = 1;
 		}
 	} else if (ru->ru_rw == RU_RECOVER) {
@@ -608,7 +606,7 @@
 			lc->sync_count++;
 		}
 	} else if (log_test_bit(lc->sync_bits, lr->u.lr_region)) {
-		/* gone for now: lc->sync_count--; */
+		lc->sync_count--;
 		log_clear_bit(lc, lc->sync_bits, lr->u.lr_region);
 	}