From 6aea16342f7448eee37efea2465951d279831014 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 12 May 2011 15:33:17 -0700
Subject: [PATCH] --- yaml --- r: 251309 b: refs/heads/master c:
 04177882265bc5014300a631e7384f8fe6b6aa0f h: refs/heads/master i:   251307:
 297eccd51415522bfbc7f4b2a94f2079d0b7cbc8 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4ce09baac7e0..a5605795ecbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da39822c6565095a0151ccf9d6b95e2ae5612885
+refs/heads/master: 04177882265bc5014300a631e7384f8fe6b6aa0f
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 3cdbb8853cd7..35c0000a658e 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -1355,7 +1355,9 @@ static int process_connect(struct ceph_connection *con)
 		 * to WAIT.  This shouldn't happen if we are the
 		 * client.
 		 */
-		pr_err("process_connect peer connecting WAIT\n");
+		pr_err("process_connect got WAIT as client\n");
+		con->error_msg = "protocol error, got WAIT as client";
+		return -1;
 
 	default:
 		pr_err("connect protocol error, will retry\n");