[DRBD-cvs] r1466 - trunk/drbd

[drbd-user@lists.linbit.com]

Author: lars
Date: 2004-07-28 17:04:28 +0200 (Wed, 28 Jul 2004)
New Revision: 1466

Modified:
   trunk/drbd/drbd_bitmap.c
   trunk/drbd/drbd_receiver.c
   trunk/drbd/drbd_worker.c
Log:
replace all D_ASSER(0) with something meaningful

Modified: trunk/drbd/drbd_bitmap.c
===================================================================
--- trunk/drbd/drbd_bitmap.c	2004-07-28 13:06:48 UTC (rev 1465)
+++ trunk/drbd/drbd_bitmap.c	2004-07-28 15:04:28 UTC (rev 1466)
@@ -144,7 +144,7 @@
 	struct drbd_bitmap *b = mdev->bitmap;
 	spin_lock_irq(&b->bm_lock);
 	if (!__test_and_clear_bit(BM_LOCKED,&mdev->bitmap->bm_flags)) {
-		D_ASSERT(0);
+		ERR("bitmap not locked in bm_unlock\n");
 	} else {
 		/* FIXME if we got a "is already locked" previously,
 		 * we unlock here even though we actually MUST NOT do so... */
@@ -841,7 +841,7 @@
 		int n = e-s;
 		while (n--) count += hweight_long(*w++);
 	} else {
-		D_ASSERT(0);
+		ERR("start offset (%d) too large in drbd_bm_e_weight\n", s);
 	}
 	spin_unlock_irqrestore(&b->bm_lock,flags);
 #if DUMP_MD >= 3
@@ -878,7 +878,7 @@
 			b->bm_set -= bm_clear_surplus(b);
 		}
 	} else {
-		D_ASSERT(0);
+		ERR("start offset (%d) too large in drbd_bm_ALe_set_all\n", s);
 	}
 	weight = b->bm_set - weight;
 	spin_unlock_irq(&b->bm_lock);

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2004-07-28 13:06:48 UTC (rev 1465)
+++ trunk/drbd/drbd_receiver.c	2004-07-28 15:04:28 UTC (rev 1466)
@@ -1176,7 +1176,8 @@
 		}
 		break;
 	default:
-		D_ASSERT(0);
+		ERR("unexpected command (%s) in receive_DataRequest\n",
+		    cmdname(h->command));
 	}
 
 	mdev->read_cnt += size >> 9;
@@ -1557,7 +1558,8 @@
 		if (!ok) goto out;
 		drbd_start_resync(mdev,SyncTarget); // XXX cannot fail ???
 	} else {
-		D_ASSERT(0);
+		ERR("unexpected cstate (%s) in receive_bitmap\n",
+		    cstate_to_name(mdev->cstate));
 	}
 
 	// We just started resync. Now we can be sure that local disk IO is okay.

Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c	2004-07-28 13:06:48 UTC (rev 1465)
+++ trunk/drbd/drbd_worker.c	2004-07-28 15:04:28 UTC (rev 1466)
@@ -538,15 +538,16 @@
 	INFO("Resync done (total %lu sec; %lu K/sec)\n",
 	     dt,(unsigned long)n);
 
-	if (mdev->cstate == SyncTarget) {
+	if (mdev->cstate == SyncTarget || mdev->cstate == PausedSyncT) {
 		drbd_md_set_flag(mdev,MDF_Consistent);
 		ERR_IF(drbd_md_test_flag(mdev,MDF_FullSync))
 			drbd_md_clear_flag(mdev,MDF_FullSync);
 		drbd_md_write(mdev);
-	} else if (mdev->cstate == SyncSource) {
+	} else if (mdev->cstate == SyncSource || mdev->cstate == PausedSyncS) {
 		set_bit(PARTNER_CONSISTENT, &mdev->flags);
 	} else {
-		D_ASSERT(0);
+		ERR("unexpected cstate (%s) in drbd_resync_finished\n",
+		    cstate_to_name(mdev->cstate));
 	}
 
 	// assert that all bit-map parts are cleared.
@@ -857,7 +858,8 @@
 			drbd_md_set_flag(mdev,MDF_Consistent);
 		}
 	} else {
-		D_ASSERT(0);
+		ERR("Usage error in drbd_start_resync! (side == %s)\n",
+		     cstate_to_name(side));
 		return;
 	}
 	drbd_md_write(mdev);