summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-13 00:33:17 +0200
committerSage Weil <sage@newdream.net>2011-05-19 20:25:04 +0200
commit04177882265bc5014300a631e7384f8fe6b6aa0f (patch)
treea008861b5c815be69cd4a6a074369359afd27904 /net
parentceph: fix broken comparison in readdir loop (diff)
downloadlinux-04177882265bc5014300a631e7384f8fe6b6aa0f.tar.xz
linux-04177882265bc5014300a631e7384f8fe6b6aa0f.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c4
1 files changed, 3 insertions, 1 deletions
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");