From c84fcd2e08049ca2f68002ca55c7907db62f53df Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Tue, 15 Mar 2011 16:04:09 +0100 Subject: [PATCH] --- yaml --- r: 345865 b: refs/heads/master c: 3c5e5f6afd242ea5944197a9b54033c1461b793c h: refs/heads/master i: 345863: 7262f15ac31f9057969f023da060f3306102b667 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1b101099eee5..256efcf6a6df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 527f4b24e51194a79f89ce5ce523236be31c511d +refs/heads/master: 3c5e5f6afd242ea5944197a9b54033c1461b793c diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index c27d3778cae6..0db6c4316f7e 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/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);