drbd: add forgotten spin_unlock
authorLars Ellenberg <lars.ellenberg@linbit.com>
Tue, 15 Mar 2011 15:04:09 +0000 (16:04 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Sat, 3 Nov 2012 23:16:22 +0000 (00:16 +0100)
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>
drivers/block/drbd/drbd_state.c

index c27d3778cae644a71ab03ca564055fbf0b3b20ab..0db6c4316f7e302dc7456a7fc403c1eac99c0f9f 100644 (file)
@@ -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);