[prev in list] [next in list] [prev in thread] [next in thread] 

List:       drbd-cvs
Subject:    [DRBD-cvs] svn commit by lars - r2241 - in trunk/drbd: . linux - *
From:       drbd-cvs () linbit ! com
Date:       2006-06-21 9:37:30
Message-ID: 20060621093730.406B52DF653A () mail ! linbit ! com
[Download RAW message or body]

Author: lars
Date: 2006-06-21 11:37:28 +0200 (Wed, 21 Jun 2006)
New Revision: 2241

Modified:
   trunk/drbd/drbd_fs.c
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_strings.c
   trunk/drbd/linux/drbd.h
Log:
* don't forget to report back the reason of failure in drbd_set_role
* fixed typo Consistnet -> Consistent



Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c	2006-06-20 15:34:28 UTC (rev 2240)
+++ trunk/drbd/drbd_fs.c	2006-06-21 09:37:28 UTC (rev 2241)
@@ -880,7 +880,7 @@
 
 	while (try++ < 3) {
 		r = _drbd_request_state(mdev,mask,val,0);
-		if( r == SS_NoConsistnetDisk && (newstate & DontBlameDrbd) && 
+		if( r == SS_NoConsistentDisk && (newstate & DontBlameDrbd) && 
 		    mdev->state.disk < UpToDate) {
 			mask.disk = disk_mask;
 			val.disk  = UpToDate;
@@ -967,6 +967,7 @@
 		D_ASSERT(mdev->this_bdev->bd_holder == drbd_sec_holder);
 		bd_release(mdev->this_bdev);
 	}
+	*arg = r;
 	return rv;
 }
 

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-06-20 15:34:28 UTC (rev 2240)
+++ trunk/drbd/drbd_main.c	2006-06-21 09:37:28 UTC (rev 2241)
@@ -710,14 +710,14 @@
 
 	if( rv <= 0 ) /* already found a reason to abort */;
 	else if( ns.role == Primary && ns.conn < Connected &&
-		 ns.disk <= Outdated ) rv=SS_NoConsistnetDisk;
+		 ns.disk <= Outdated ) rv=SS_NoConsistentDisk;
 
 	else if( fp >= Resource &&
 		 ns.role == Primary && ns.conn < Connected &&
 		 ns.pdsk >= DUnknown ) rv=SS_PrimaryNOP;
 
 	else if( ns.role == Primary && ns.disk <= Inconsistent &&
-		 ns.pdsk <= Inconsistent ) rv=SS_NoConsistnetDisk;
+		 ns.pdsk <= Inconsistent ) rv=SS_NoConsistentDisk;
 	
 	else if( ns.conn > Connected &&
 		 ns.disk < UpToDate && ns.pdsk < UpToDate ) 

Modified: trunk/drbd/drbd_strings.c
===================================================================
--- trunk/drbd/drbd_strings.c	2006-06-20 15:34:28 UTC (rev 2240)
+++ trunk/drbd/drbd_strings.c	2006-06-21 09:37:28 UTC (rev 2241)
@@ -62,7 +62,7 @@
 
 static const char *drbd_state_sw_errors[] = {
 	[-SS_TowPrimaries] = "Multiple primaries now allowed by config",
-	[-SS_NoConsistnetDisk] = 
+	[-SS_NoConsistentDisk] = 
 		"Refusing to be Primary without at least one consistent disk",
 	[-SS_BothInconsistent] = "Refusing to be inconsistent on both nodes",
 	[-SS_SyncingDiskless] = "Refusing to be syncing and diskless",

Modified: trunk/drbd/linux/drbd.h
===================================================================
--- trunk/drbd/linux/drbd.h	2006-06-20 15:34:28 UTC (rev 2240)
+++ trunk/drbd/linux/drbd.h	2006-06-21 09:37:28 UTC (rev 2241)
@@ -266,7 +266,7 @@
 	SS_Success=1,
 	SS_UnknownError=0, // Used to sleep longer in _drbd_request_state
 	SS_TowPrimaries=-1,
-	SS_NoConsistnetDisk=-2,
+	SS_NoConsistentDisk=-2,
 	SS_BothInconsistent=-4,
 	SS_SyncingDiskless=-5,
 	SS_ConnectedOutdates=-6,

_______________________________________________
drbd-cvs mailing list
drbd-cvs@lists.linbit.com
http://lists.linbit.com/mailman/listinfo/drbd-cvs
[prev in list] [next in list] [prev in thread] [next in thread]