[DRBD-cvs] r1650 - trunk/drbd

[svn at svn.drbd.org]

Author: phil
Date: 2004-11-23 21:35:02 +0100 (Tue, 23 Nov 2004)
New Revision: 1650

Modified:
   trunk/drbd/drbd_fs.c
   trunk/drbd/drbd_int.h
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_strings.c
Log:
Minor fixes. BTW the kernel->userland callbacks already work!


Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c	2004-11-22 22:35:08 UTC (rev 1649)
+++ trunk/drbd/drbd_fs.c	2004-11-23 20:35:02 UTC (rev 1650)
@@ -624,6 +624,7 @@
 	if ( r == -2 ) {
 		/* request state does not like the new state. */
 		if (! (newstate & DontBlameDrbd)) {
+			print_st_err(mdev,os,ns,r);
 			return -EIO;
 		}
 

Modified: trunk/drbd/drbd_int.h
===================================================================
--- trunk/drbd/drbd_int.h	2004-11-22 22:35:08 UTC (rev 1649)
+++ trunk/drbd/drbd_int.h	2004-11-23 20:35:02 UTC (rev 1650)
@@ -266,7 +266,7 @@
 
 #define DRBD_MD_MAGIC (DRBD_MAGIC+4) // 4th incarnation of the disk layout.
 
-#define DRBD_PANIC 2
+#define DRBD_PANIC 3
 /* do_panic alternatives:
  *	0: panic();
  *	1: machine_halt; SORRY, this DOES NOT WORK

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2004-11-22 22:35:08 UTC (rev 1649)
+++ trunk/drbd/drbd_main.c	2004-11-23 20:35:02 UTC (rev 1650)
@@ -481,6 +481,9 @@
 		if( ns.s.role == Primary && ns.s.disk <= Inconsistent && 
 		    ns.s.conn < Connected ) rv=-2;
 
+		if( ns.s.role == Primary && ns.s.disk <= Inconsistent && 
+		    ns.s.pdsk <= Inconsistent ) rv=-2;
+
 		if( ns.s.peer == Primary && ns.s.pdsk <= Inconsistent && 
 		    ns.s.conn < Connected ) rv=-3;
 
@@ -536,7 +539,7 @@
 	}
 
 	if ( ns.s.role == Primary && ns.s.conn < Connected &&
-	     ns.s.disk < UpToDate ) {
+	     ns.s.disk < Consistent ) {
 		drbd_panic("No access to good data anymore.\n");
 	}
 

Modified: trunk/drbd/drbd_strings.c
===================================================================
--- trunk/drbd/drbd_strings.c	2004-11-22 22:35:08 UTC (rev 1649)
+++ trunk/drbd/drbd_strings.c	2004-11-23 20:35:02 UTC (rev 1650)
@@ -60,7 +60,7 @@
 
 static const char *drbd_state_sw_errors[] = {
 	[1] = "Multiple primaries now allowed by config",
-	[2] = "Refusing to be Primary without an at least Consistent disk",
+	[2] = "Refusing to be Primary without at least one consistent disk",
 	[3] = "Refusing to make peer Primary without disk",
 	[4] = "Refusing to be inconsistent on both nodes",
 	[5] = "Refusing to be syncing and diskless",