From c290d6a9a4627b255c93f6536a27bb0a584ca8fe Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 26 Mar 2012 15:57:00 +0200 Subject: [PATCH] --- yaml --- r: 346168 b: refs/heads/master c: e8744f5aca47cac36af1e2b5eb55f7131bf198df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c1fb1ae47e15..2a0c173bd423 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d93f63028f3bc07bbcf6fe25d8d7d8a50f441bd9 +refs/heads/master: e8744f5aca47cac36af1e2b5eb55f7131bf198df diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index 96fdbfa79a6c..8c5cedfb4d9c 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -199,7 +199,7 @@ static int cl_wide_st_chg(struct drbd_conf *mdev, ((os.role != R_PRIMARY && ns.role == R_PRIMARY) || (os.conn != C_STARTING_SYNC_T && ns.conn == C_STARTING_SYNC_T) || (os.conn != C_STARTING_SYNC_S && ns.conn == C_STARTING_SYNC_S) || - (os.disk != D_DISKLESS && ns.disk == D_DISKLESS))) || + (os.disk != D_FAILED && ns.disk == D_FAILED))) || (os.conn >= C_CONNECTED && ns.conn == C_DISCONNECTING) || (os.conn == C_CONNECTED && ns.conn == C_VERIFY_S) || (os.conn == C_CONNECTED && ns.conn == C_WF_REPORT_PARAMS);