diff options
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 2060db69f18..04c305d36f8 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
| @@ -827,9 +827,10 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state | |||
| 827 | os.conn <= C_DISCONNECTING) | 827 | os.conn <= C_DISCONNECTING) |
| 828 | ns.conn = os.conn; | 828 | ns.conn = os.conn; |
| 829 | 829 | ||
| 830 | /* After a network error (+C_TEAR_DOWN) only C_UNCONNECTED or C_DISCONNECTING can follow */ | 830 | /* After a network error (+C_TEAR_DOWN) only C_UNCONNECTED or C_DISCONNECTING can follow. |
| 831 | * If you try to go into some Sync* state, that shall fail (elsewhere). */ | ||
| 831 | if (os.conn >= C_TIMEOUT && os.conn <= C_TEAR_DOWN && | 832 | if (os.conn >= C_TIMEOUT && os.conn <= C_TEAR_DOWN && |
| 832 | ns.conn != C_UNCONNECTED && ns.conn != C_DISCONNECTING) | 833 | ns.conn != C_UNCONNECTED && ns.conn != C_DISCONNECTING && ns.conn <= C_TEAR_DOWN) |
| 833 | ns.conn = os.conn; | 834 | ns.conn = os.conn; |
| 834 | 835 | ||
| 835 | /* After C_DISCONNECTING only C_STANDALONE may follow */ | 836 | /* After C_DISCONNECTING only C_STANDALONE may follow */ |