diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-07-15 18:44:26 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-05-09 15:15:42 +0200 |
| commit | 79f16f5dbc95da372c25afddac80f4adef3cfce1 (patch) | |
| tree | 90deb417250c3dc27997219e5bd64f396573f590 /drivers/block/drbd | |
| parent | bca482e90bf87569ffb87cba2c3a777ac23e5c86 (diff) | |
| download | linux-79f16f5dbc95da372c25afddac80f4adef3cfce1.tar.gz linux-79f16f5dbc95da372c25afddac80f4adef3cfce1.tar.xz linux-79f16f5dbc95da372c25afddac80f4adef3cfce1.zip | |
drbd: Consider that the no-data-condition could be in connected state
...when the peer has inconsistent data. In that case we failed to
clear the susp_nod flag. When the local disk was attached again
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index b62e3559b50c..0ee05315f9ac 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1412,7 +1412,8 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED) what = resend; - if (os.disk == D_ATTACHING && ns.disk > D_ATTACHING) + if ((os.disk == D_ATTACHING || os.disk == D_NEGOTIATING) && + ns.disk > D_NEGOTIATING) what = restart_frozen_disk_io; if (what != nothing) |