From: Philipp Reisner Date: Tue, 28 Aug 2012 09:07:56 +0000 (+0200) Subject: drbd: Do not check aspects that are not subject to change in _conn_requests_state() X-Git-Tag: v5.15~21037^2~18^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07fc96197aec46f7ad4f08a4b2a1ea426112e24d;p=platform%2Fkernel%2Flinux-starfive.git drbd: Do not check aspects that are not subject to change in _conn_requests_state() When _conn_requests_state() is used to change other parts of the state than the connection, do not check for a valid connection transition. 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 f3e6090..9ae40c9 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/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)