diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-01-17 09:14:26 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:45:39 -0500 |
commit | 94f2b05f03fbc605f83ae501682c85ff4535bb6d (patch) | |
tree | 8814ec8c4f9a330f8560de48d0072d10423c8bb4 | |
parent | 148efa165e9464927887b03c83a52c33b80b4431 (diff) |
drbd: Killed an assert that is no longer valid
The point is that drbd_disconnect() can be called with a cstate of
WFConnection.
That happens if the user issues "drbdsetup disconnect" while the
drbd_connect() function executes. Then drbdd_init() will call
drbdd(), which in turn will return without receiving any
packets. Then drbdd_init() will end up calling drbd_disconnect()
with a cstate of WFConnection.
Bottom line: This assertion is wrong as it is, and we do not
see value in fixing it. => Removing it.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index fb8e86153fd0..2207d2886f84 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -3763,9 +3763,6 @@ static void drbd_disconnect(struct drbd_conf *mdev) | |||
3763 | 3763 | ||
3764 | if (mdev->state.conn == C_STANDALONE) | 3764 | if (mdev->state.conn == C_STANDALONE) |
3765 | return; | 3765 | return; |
3766 | if (mdev->state.conn >= C_WF_CONNECTION) | ||
3767 | dev_err(DEV, "ASSERT FAILED cstate = %s, expected < WFConnection\n", | ||
3768 | drbd_conn_str(mdev->state.conn)); | ||
3769 | 3766 | ||
3770 | /* asender does not clean up anything. it must not interfere, either */ | 3767 | /* asender does not clean up anything. it must not interfere, either */ |
3771 | drbd_thread_stop(&mdev->asender); | 3768 | drbd_thread_stop(&mdev->asender); |