---

yaml --- r: 346255 b: refs/heads/master c: 07fc961 h: refs/heads/master i: 346253: 4b2cc53 346251: 9baf822 346247: 4a63528 346239: b075f10 v: v3
git-mirror · Nov 9, 2012 · 113e3df · 113e3df
1 parent 46f3f5c
commit 113e3df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 892fdd1aee35803bfa41ccf4df850ddb70f0811c
+refs/heads/master: 07fc96197aec46f7ad4f08a4b2a1ea426112e24d
diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c
@@ -1742,9 +1742,11 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_
 	union drbd_state ns_max, ns_min, os;
 	bool have_mutex = false;
 
-	rv = is_valid_conn_transition(oc, val.conn);
-	if (rv < SS_SUCCESS)
-		goto abort;
+	if (mask.conn) {
+		rv = is_valid_conn_transition(oc, val.conn);
+		if (rv < SS_SUCCESS)
+			goto abort;
+	}
 
 	rv = conn_is_valid_transition(tconn, mask, val, flags);
 	if (rv < SS_SUCCESS)