---

yaml --- r: 345865 b: refs/heads/master c: 3c5e5f6 h: refs/heads/master i: 345863: 7262f15 v: v3
git-mirror · Nov 3, 2012 · c84fcd2 · c84fcd2
1 parent 70fc08b
commit c84fcd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);