[DRBD-cvs] drbd by phil; receive_Barrier() now returns zero on ne...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Mon, 24 May 2004 16:44:15 +0200 (CEST)
DRBD CVS committal
Author : phil
Module : drbd
Dir : drbd/drbd
Modified Files:
Tag: rel-0_7-branch
drbd_receiver.c
Log Message:
receive_Barrier() now returns zero on network failure. (does not fix anything)
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_receiver.c,v
retrieving revision 1.97.2.162
retrieving revision 1.97.2.163
diff -u -3 -r1.97.2.162 -r1.97.2.163
--- drbd_receiver.c 21 May 2004 08:49:50 -0000 1.97.2.162
+++ drbd_receiver.c 24 May 2004 14:44:10 -0000 1.97.2.163
@@ -761,18 +761,16 @@
drbd_wait_ee(mdev,&mdev->active_ee);
spin_lock_irq(&mdev->ee_lock);
- rv=_drbd_process_ee(mdev,&mdev->done_ee);
- // FIXME no error check here?
+ rv = _drbd_process_ee(mdev,&mdev->done_ee);
epoch_size=mdev->epoch_size;
mdev->epoch_size=0;
spin_unlock_irq(&mdev->ee_lock);
- // FIXME no error check here?
- drbd_send_b_ack(mdev, p->barrier, epoch_size);
+ rv &= drbd_send_b_ack(mdev, p->barrier, epoch_size);
dec_unacked(mdev,HERE);
- return TRUE;
+ return rv;
}
STATIC struct Tl_epoch_entry *