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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fb4746d8d3f9c3e48f7fc65ed24bc54bb8032aa;p=linux-beck.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_state.c b/drivers/block/drbd/drbd_state.c index 1763357a065a..60371ba90fb1 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1180,7 +1180,8 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, if (os.conn < C_CONNECTED && conn_lowest_conn(mdev->tconn) >= C_CONNECTED) what = RESEND; - if (os.disk == D_ATTACHING && conn_lowest_disk(mdev->tconn) > D_ATTACHING) + if ((os.disk == D_ATTACHING || os.disk == D_NEGOTIATING) && + conn_lowest_disk(mdev->tconn) > D_NEGOTIATING) what = RESTART_FROZEN_DISK_IO; if (what != NOTHING) {