[DRBD-cvs] svn commit by phil - r2915 - branches/drbd-8.0/drbd -
Fix for the last change.
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Fri Jun 8 11:48:03 CEST 2007
Author: phil
Date: 2007-06-08 11:48:01 +0200 (Fri, 08 Jun 2007)
New Revision: 2915
Modified:
branches/drbd-8.0/drbd/drbd_receiver.c
Log:
Fix for the last change.
Modified: branches/drbd-8.0/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_receiver.c 2007-06-05 07:29:24 UTC (rev 2914)
+++ branches/drbd-8.0/drbd/drbd_receiver.c 2007-06-08 09:48:01 UTC (rev 2915)
@@ -2430,9 +2430,6 @@
ns.pdsk == Negotiating ) ns.pdsk = UpToDate;
rv = _drbd_set_state(mdev,ns,ChgStateVerbose | ChgStateHard);
spin_unlock_irq(&mdev->req_lock);
- if (rv==SS_Success) {
- after_state_ch(mdev,os,ns,ChgStateVerbose | ChgStateHard);
- }
if(rv < SS_Success) {
drbd_force_state(mdev,NS(conn,Disconnecting));
@@ -2451,6 +2448,10 @@
}
}
+ if (rv==SS_Success) {
+ after_state_ch(mdev,os,ns,ChgStateVerbose | ChgStateHard);
+ }
+
mdev->net_conf->want_lose = 0;
/* FIXME assertion for (gencounts do not diverge) */
More information about the drbd-cvs
mailing list