Messages in this thread Patch in this message | | | From | Philipp Reisner <> | Subject | [PATCH 17/18] drbd: add forgotten spin_unlock | Date | Thu, 1 Sep 2011 14:49:04 +0200 |
| |
From: Lars Ellenberg <lars.ellenberg@linbit.com>
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 | 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 c6a659b..3ca535e 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -181,8 +181,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); -- 1.7.4.1
| |