From a872d60453a2cda7e2f01650707507e79a0ef954 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 3 Sep 2012 15:39:01 +0200 Subject: [PATCH] --- yaml --- r: 346263 b: refs/heads/master c: a3025a273700fc51dd561c7b2941f3c9db9be90a h: refs/heads/master i: 346261: e89949f4704dcaeb927b38e4f414185be13dc807 346259: fdb9361bcba7690c782f6042aac82abf5ac116be 346255: 113e3df546b60a16fa723be108984f1c1f811cc5 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c8c1d002e70a..87a1a2d9b0ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1393b59f8c46001c8dbd47078881483cf97813c3 +refs/heads/master: a3025a273700fc51dd561c7b2941f3c9db9be90a diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index 84512ec19173..69ef35266bac 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -277,16 +277,16 @@ _req_st_cond(struct drbd_conf *mdev, union drbd_state mask, os = drbd_read_state(mdev); ns = sanitize_state(mdev, apply_mask_val(os, mask, val), NULL); rv = is_valid_transition(os, ns); - if (rv == SS_SUCCESS) + if (rv >= SS_SUCCESS) rv = SS_UNKNOWN_ERROR; /* cont waiting, otherwise fail. */ if (!cl_wide_st_chg(mdev, os, ns)) rv = SS_CW_NO_NEED; if (rv == SS_UNKNOWN_ERROR) { rv = is_valid_state(mdev, ns); - if (rv == SS_SUCCESS) { + if (rv >= SS_SUCCESS) { rv = is_valid_soft_transition(os, ns, mdev->tconn); - if (rv == SS_SUCCESS) + if (rv >= SS_SUCCESS) rv = SS_UNKNOWN_ERROR; /* cont waiting, otherwise fail. */ } }