diff options
| author | Philipp Reisner | 2011-02-11 19:43:55 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-10-14 16:45:01 +0200 |
| commit | dad20554812e73a2bfbe45d1b161d5d3c249e597 (patch) | |
| tree | cd2e1d689a8366f0f460c63f6c37fc4797ab1820 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: Killed volume0; last step of multi-volume-enablement (diff) | |
| download | kernel-qcow2-linux-dad20554812e73a2bfbe45d1b161d5d3c249e597.tar.gz kernel-qcow2-linux-dad20554812e73a2bfbe45d1b161d5d3c249e597.tar.xz kernel-qcow2-linux-dad20554812e73a2bfbe45d1b161d5d3c249e597.zip | |
drbd: Removed drbd_state_lock() and drbd_state_unlock()
The lock they constructed is only taken when the state_mutex
was already taken. It is superficial.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 7376d9dc0bc7..91433168e1d4 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -184,9 +184,7 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask, goto abort; } - drbd_state_lock(mdev); if (!drbd_send_state_req(mdev, mask, val)) { - drbd_state_unlock(mdev); rv = SS_CW_FAILED_BY_PEER; if (f & CS_VERBOSE) print_st_err(mdev, os, ns, rv); @@ -197,7 +195,6 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask, (rv = _req_st_cond(mdev, mask, val))); if (rv < SS_SUCCESS) { - drbd_state_unlock(mdev); if (f & CS_VERBOSE) print_st_err(mdev, os, ns, rv); goto abort; @@ -205,7 +202,6 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask, spin_lock_irqsave(&mdev->tconn->req_lock, flags); ns = apply_mask_val(mdev->state, mask, val); rv = _drbd_set_state(mdev, ns, f, &done); - drbd_state_unlock(mdev); } else { rv = _drbd_set_state(mdev, ns, f, &done); } |