From 113e3df546b60a16fa723be108984f1c1f811cc5 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Tue, 28 Aug 2012 11:07:56 +0200 Subject: [PATCH] --- yaml --- r: 346255 b: refs/heads/master c: 07fc96197aec46f7ad4f08a4b2a1ea426112e24d h: refs/heads/master i: 346253: 4b2cc53e336f337b1a8079e9ca7ee239efbc0977 346251: 9baf822c3eebbd1168a255a9c86dd2046da6a234 346247: 4a63528c5a5d587a0ad65750fd7050e8806afb09 346239: b075f10f9b3a2b4943136715c7fcbda1e2a53f41 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c3611f96178e..082e63035cc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 892fdd1aee35803bfa41ccf4df850ddb70f0811c +refs/heads/master: 07fc96197aec46f7ad4f08a4b2a1ea426112e24d diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index f3e6090d462b..9ae40c96c1be 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -1742,9 +1742,11 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ union drbd_state ns_max, ns_min, os; bool have_mutex = false; - rv = is_valid_conn_transition(oc, val.conn); - if (rv < SS_SUCCESS) - goto abort; + if (mask.conn) { + rv = is_valid_conn_transition(oc, val.conn); + if (rv < SS_SUCCESS) + goto abort; + } rv = conn_is_valid_transition(tconn, mask, val, flags); if (rv < SS_SUCCESS)