dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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 <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2012-08-28 11:07:56 +02:00
parent 892fdd1aee
commit 07fc96197a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/drbd/drbd_state.c
View File

@ -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)