From 105501707c9ccb23dd0d6d469d2658fcc79f5a2d Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 10 Feb 2011 20:27:54 +0100 Subject: [PATCH] --- yaml --- r: 345811 b: refs/heads/master c: 5aabf467e3933ba3fc30fd06a70517ab8a27a9bb h: refs/heads/master i: 345809: 2b1e729e19b6c59249586e2bef82f50af5712ad7 345807: cd2f17af390e406825c41d3e51b7a0f399a8d586 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 010d840d4d7f..75e6b2ef2480 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf29c9d8c8eff69885ee4c8ddf5f9db4dcc5ab6e +refs/heads/master: 5aabf467e3933ba3fc30fd06a70517ab8a27a9bb diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index f34e7d4c8886..8c49ca8dea3c 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -1375,8 +1375,6 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ struct after_conn_state_chg_work *acscw; enum drbd_conns oc = tconn->cstate; - read_lock(&global_state_lock); - rv = is_valid_conn_transition(oc, val.conn); if (rv < SS_SUCCESS) goto abort; @@ -1418,8 +1416,6 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ } abort: - read_unlock(&global_state_lock); - return rv; }