[DRBD-cvs] svn commit by phil - r2760 - trunk/drbd - Fixed the issue that an IO-Error could bring the disk s

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-02-19 14:52:58 +0100 (Mon, 19 Feb 2007)
New Revision: 2760

Modified:
   trunk/drbd/drbd_int.h
Log:
Fixed the issue that an IO-Error could bring the disk state
back from Diskless to Failed. Bad OOPSes where the result...


Modified: trunk/drbd/drbd_int.h
===================================================================
--- trunk/drbd/drbd_int.h	2007-02-16 12:31:41 UTC (rev 2759)
+++ trunk/drbd/drbd_int.h	2007-02-19 13:52:58 UTC (rev 2760)
@@ -1471,15 +1471,12 @@
 		}
 		/* NOTE fall through to detach case if forcedetach set */
 	case Detach:
-		if (_drbd_set_state(_NS(mdev,disk,Failed),ChgStateHard)
-		    == SS_Success) {
-			if (printk_ratelimit())
-				ERR("Local IO failed. Detaching...\n");
+	case CallIOEHelper:
+		if (mdev->state.disk > Failed) {
+			_drbd_set_state(_NS(mdev,disk,Failed),ChgStateHard);
+			ERR("Local IO failed. Detaching...\n");
 		}
 		break;
-	case CallIOEHelper:
-		_drbd_set_state(_NS(mdev,disk,Failed),ChgStateHard);
-		break;
 	}
 }