From cbb25fb9eeed3f25ce983048dc8fe01e13c2108e Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Fri, 15 Jul 2011 18:44:26 +0200 Subject: [PATCH] --- yaml --- r: 346114 b: refs/heads/master c: 3fb4746d8d3f9c3e48f7fc65ed24bc54bb8032aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index da54a8aafc25..a8d0bf8ac0af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97af09d51ee1ca4a8687b4c3492a1739384d5a42 +refs/heads/master: 3fb4746d8d3f9c3e48f7fc65ed24bc54bb8032aa diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index 1763357a065a..60371ba90fb1 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/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) {