[DRBD-cvs] svn commit by phil - r2007 - in trunk: . drbd - Fixed the return value of receive_Barrier_no_tcq() [ an

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2005-11-18 14:51:23 +0100 (Fri, 18 Nov 2005)
New Revision: 2007

Modified:
   trunk/ROADMAP
   trunk/drbd/drbd_receiver.c
Log:
Fixed the return value of receive_Barrier_no_tcq() 
  [ and receive_Barrier_rcq() ]



Modified: trunk/ROADMAP
===================================================================
--- trunk/ROADMAP	2005-11-17 21:08:33 UTC (rev 2006)
+++ trunk/ROADMAP	2005-11-18 13:51:23 UTC (rev 2007)
@@ -644,6 +644,10 @@
    99% DONE
 
 24 Make it possible to hot-add disk drives == Atomic configuration changes.
+   Missing: Rewrite size determination code. It needs to fail in case
+            there is already a primary node in the cluster, and the
+            to attached device is smaller than the current size.
+
    80% DONE [ The net and disk config changes are atomic by now ]
 
 25 Add reserved fields to DRBD-meta-data, add a bytes per bit field to

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2005-11-17 21:08:33 UTC (rev 2006)
+++ trunk/drbd/drbd_receiver.c	2005-11-18 13:51:23 UTC (rev 2007)
@@ -733,7 +733,7 @@
 #if 0
 STATIC int receive_Barrier_tcq(drbd_dev *mdev, Drbd_Header* h)
 {
-	int rv=TRUE;
+	int rv;
 	int epoch_size=0;
 	Drbd_Barrier_Packet *p = (Drbd_Barrier_Packet*)h;
 
@@ -756,7 +756,7 @@
 	spin_unlock_irq(&mdev->ee_lock);
 
 	if(epoch_size) {
-		rv &= drbd_send_b_ack(mdev, p->barrier, epoch_size);
+		rv = drbd_send_b_ack(mdev, p->barrier, epoch_size);
 		dec_unacked(mdev);
 	}
 
@@ -780,14 +780,13 @@
 	if (mdev->net_conf->wire_protocol != DRBD_PROT_C)
 		drbd_kick_lo(mdev);
 
-
 	spin_lock_irq(&mdev->ee_lock);
 	_drbd_wait_ee_list_empty(mdev,&mdev->active_ee);
 	epoch_size = mdev->epoch_size;
 	mdev->epoch_size = 0;
 	spin_unlock_irq(&mdev->ee_lock);
 
-	rv &= drbd_send_b_ack(mdev, p->barrier, epoch_size);
+	rv = drbd_send_b_ack(mdev, p->barrier, epoch_size);
 	dec_unacked(mdev);
 
 	return rv;