[DRBD-cvs] r1861 - in branches/drbd-0.7: drbd testing

[www-data]

Author: lars
Date: 2005-07-13 18:18:50 +0200 (Wed, 13 Jul 2005)
New Revision: 1861

Modified:
   branches/drbd-0.7/drbd/drbd_receiver.c
   branches/drbd-0.7/testing/read_gc.pl
Log:

if I cannot set it, I may not clear it ...
 (the lockout flag in _drbd_process_ee)

read_gc.pl: the size is unsigned long....



Modified: branches/drbd-0.7/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_receiver.c	2005-07-13 15:57:51 UTC (rev 1860)
+++ branches/drbd-0.7/drbd/drbd_receiver.c	2005-07-13 16:18:50 UTC (rev 1861)
@@ -407,7 +407,6 @@
 
 	if( test_and_set_bit(PROCESS_EE_RUNNING,&mdev->flags) ) {
 		if(!be_sleepy) {
-			clear_bit(PROCESS_EE_RUNNING,&mdev->flags);
 			return 3;
 		}
 		spin_unlock_irq(&mdev->ee_lock);

Modified: branches/drbd-0.7/testing/read_gc.pl
===================================================================
--- branches/drbd-0.7/testing/read_gc.pl	2005-07-13 15:57:51 UTC (rev 1860)
+++ branches/drbd-0.7/testing/read_gc.pl	2005-07-13 16:18:50 UTC (rev 1861)
@@ -42,7 +42,7 @@
 
     die "state file corrupt" if($MagicNr != DRBD_MD_MAGIC);
 
-    printf(" %6s | %3s | %3d | %3d | %3d | %3d | %3s | %3s | %3s | %6d KB\n",
+    printf(" %8s | %3s | %3d | %3d | %3d | %3d | %3s | %3s | %3s | %6lu KB\n",
 	   $resource,
 	   $Flags & 0x01 ? "1/c" : "0/i", # is consistent
 	                                  # (may become sync source)
@@ -65,17 +65,17 @@
 
     @resources = sort(split(' ',`drbdadm sh-resources`));
 
-    print <<EOS;
-                                           WantFullSync |
-                                     ConnectedInd |     |
-                                  lastState |     |     |
-                         ArbitraryCnt |     |     |     |
-                   ConnectedCnt |     |     |     |     |
-               TimeoutCnt |     |     |     |     |     |
-           HumanCnt |     |     |     |     |     |     |
-   Consistent |     |     |     |     |     |     |     |
-resource|     |     |     |     |     |     |     |     |   Size
---------+-----+-----+-----+-----+-----+-----+-----+-----+----------+
+      print <<EOS;
+                                             WantFullSync |
+                                       ConnectedInd |     |
+                                    lastState |     |     |
+                           ArbitraryCnt |     |     |     |
+                     ConnectedCnt |     |     |     |     |
+                 TimeoutCnt |     |     |     |     |     |
+             HumanCnt |     |     |     |     |     |     |
+     Consistent |     |     |     |     |     |     |     |
+  resource|     |     |     |     |     |     |     |     |   Size
+----------+-----+-----+-----+-----+-----+-----+-----+-----+----------+
 EOS
 
     for $res (@resources) {