summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_state.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-03-15 16:56:18 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-04 00:16:25 +0100
commit2325eb661f745ed543ef33642f5fe0dd6d1f0850 (patch)
treee50f29e7d13e837c9ab3ca35ddc0ef077144cd63 /drivers/block/drbd/drbd_state.c
parent082a3439a2d34c465c2f5bc10a324fb4d96b2332 (diff)
downloadblackbird-op-linux-2325eb661f745ed543ef33642f5fe0dd6d1f0850.tar.gz
blackbird-op-linux-2325eb661f745ed543ef33642f5fe0dd6d1f0850.zip
drbd: New minors have to intherit the connection state form their connection
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
-rw-r--r--drivers/block/drbd/drbd_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 0db6c4316f7e..886b996ec7b3 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -432,8 +432,8 @@ is_valid_soft_transition(union drbd_state os, union drbd_state ns)
if (ns.conn == C_DISCONNECTING && os.conn == C_UNCONNECTED)
rv = SS_IN_TRANSIENT_STATE;
- if (ns.conn == os.conn && ns.conn == C_WF_REPORT_PARAMS)
- rv = SS_IN_TRANSIENT_STATE;
+ /* if (ns.conn == os.conn && ns.conn == C_WF_REPORT_PARAMS)
+ rv = SS_IN_TRANSIENT_STATE; */
if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) && os.conn < C_CONNECTED)
rv = SS_NEED_CONNECTION;
OpenPOWER on IntegriCloud