From: Philipp Reisner Date: Fri, 15 Jul 2011 16:44:26 +0000 (+0200) Subject: drbd: Consider that the no-data-condition could be in connected state X-Git-Tag: v3.5-rc1~41^2^2~42 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79f16f5dbc95da372c25afddac80f4adef3cfce1;p=karo-tx-linux.git 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 Signed-off-by: Lars Ellenberg --- 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)