diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2011-03-15 16:04:09 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-04 00:16:22 +0100 |
| commit | 3c5e5f6afd242ea5944197a9b54033c1461b793c (patch) | |
| tree | 6e60b56db167dded37917d5708d90bc25c8016e1 | |
| parent | 527f4b24e51194a79f89ce5ce523236be31c511d (diff) | |
| download | lwn-3c5e5f6afd242ea5944197a9b54033c1461b793c.tar.gz lwn-3c5e5f6afd242ea5944197a9b54033c1461b793c.zip | |
drbd: add forgotten spin_unlock
somehow a "goto abort" was introduced with commit
drbd: Extracted is_valid_transition() out of sanitize_state()
which left drbd_req_state still holding the spin lock.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index c27d3778cae6..0db6c4316f7e 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -180,8 +180,10 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask, os = mdev->state; ns = sanitize_state(mdev, apply_mask_val(os, mask, val), NULL); rv = is_valid_transition(os, ns); - if (rv < SS_SUCCESS) + if (rv < SS_SUCCESS) { + spin_unlock_irqrestore(&mdev->tconn->req_lock, flags); goto abort; + } if (cl_wide_st_chg(mdev, os, ns)) { rv = is_valid_state(mdev, ns); |