From: Sage Weil <sage@newdream.net>
Date: Thu, 12 May 2011 22:33:17 +0000 (-0700)
Subject: libceph: fix TAG_WAIT case
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17571^2~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=04177882265bc5014300a631e7384f8fe6b6aa0f;p=mirror_ubuntu-artful-kernel.git

libceph: fix TAG_WAIT case

If we get a WAIT as a client something went wrong; error out.  And don't
fall through to an unrelated case.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 3cdbb8853cd7..35c0000a658e 100644
--- a/net/ceph/messenger.c
+++ b/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");