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

List:       drbd-cvs
Subject:    [DRBD-cvs] svn commit by phil - r2251 - trunk/drbd - Made
From:       drbd-cvs () linbit ! com
Date:       2006-06-29 14:38:48
Message-ID: 20060629143848.4063C2DF625D () mail ! linbit ! com
[Download RAW message or body]

Author: phil
Date: 2006-06-29 16:38:47 +0200 (Thu, 29 Jun 2006)
New Revision: 2251

Modified:
   trunk/drbd/drbd_fs.c
   trunk/drbd/drbd_main.c
Log:
Made CRASHED_PRIMARY stuff to make use of drbd-8.0 state
change mechanism.


Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c	2006-06-29 14:19:21 UTC (rev 2250)
+++ trunk/drbd/drbd_fs.c	2006-06-29 14:38:47 UTC (rev 2251)
@@ -450,12 +450,6 @@
 		goto release_bdev3_fail_ioctl;
 	}
 
-	if(drbd_md_test_flag(nbc,MDF_PrimaryInd)) {
-		set_bit(CRASHED_PRIMARY, &mdev->flags);
-	} else {		
-		clear_bit(CRASHED_PRIMARY, &mdev->flags);
-	}
-
 	// Since ware are diskless, fix the AL first...
 	if (drbd_check_al_size(mdev)) {
 		retcode = KMallocFailed;
@@ -476,6 +470,12 @@
 
 	// Point of no return reached.
 
+	if(drbd_md_test_flag(nbc,MDF_PrimaryInd)) {
+		set_bit(CRASHED_PRIMARY, &mdev->flags);
+	} else {		
+		clear_bit(CRASHED_PRIMARY, &mdev->flags);
+	}
+
 	D_ASSERT(mdev->bc == NULL);
 	mdev->bc = nbc;
 	mdev->resync = resync_lru;
@@ -586,7 +586,6 @@
 	return 0;
 
  release_bdev3_fail_ioctl:
-	clear_bit(CRASHED_PRIMARY, &mdev->flags);
 	drbd_force_state(mdev,NS(disk,Diskless));
 	drbd_md_sync(mdev);
  release_bdev2_fail_ioctl:
@@ -962,7 +961,6 @@
 		       mdev->bc->md.uuid[Bitmap] == 0) || forced ) {
 			drbd_uuid_new_current(mdev);
 		}
-		clear_bit(CRASHED_PRIMARY, &mdev->flags);
 	}
 
 	if(mdev->state.disk > Diskless && (newstate & Secondary)) {

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-06-29 14:19:21 UTC (rev 2250)
+++ trunk/drbd/drbd_main.c	2006-06-29 14:38:47 UTC (rev 2251)
@@ -928,8 +928,8 @@
 	enum fencing_policy fp;
 	u32 mdf;
 
-	if ( os.role != Primary && ns.role == Primary ||
-	     os.conn != Conneted && ns.conn == Connected ) {
+	if ( (os.role != Primary && ns.role == Primary)    ||
+	     (os.conn != Connected && ns.conn == Connected) ) {
 		clear_bit(CRASHED_PRIMARY, &mdev->flags);
 	}
 

_______________________________________________
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]