From c8fbc67dc389cf08c2a904f5c5d7fb1a5e517527 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 14 Dec 2009 14:56:56 -0800
Subject: [PATCH] --- yaml --- r: 188650 b: refs/heads/master c:
 92ac41d0a4ab26fb68d3f841332e5d1f15d79123 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ceph/messenger.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d03780e1b922..6a5a6a50cbb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e095e8b40b0402ad3bcadc5b8d84c38b26c30b2
+refs/heads/master: 92ac41d0a4ab26fb68d3f841332e5d1f15d79123
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index 98519bd33f04..986d8fb9c574 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -625,8 +625,6 @@ static void prepare_write_connect(struct ceph_messenger *msgr,
 	con->out_connect.global_seq = cpu_to_le32(global_seq);
 	con->out_connect.protocol_version = cpu_to_le32(proto);
 	con->out_connect.flags = 0;
-	if (test_bit(LOSSYTX, &con->state))
-		con->out_connect.flags = CEPH_MSG_CONNECT_LOSSY;
 
 	if (!after_banner) {
 		con->out_kvec_left = 0;
@@ -1168,6 +1166,10 @@ static int process_connect(struct ceph_connection *con)
 		     con->connect_seq);
 		WARN_ON(con->connect_seq !=
 			le32_to_cpu(con->in_reply.connect_seq));
+
+		if (con->in_reply.flags & CEPH_MSG_CONNECT_LOSSY)
+			set_bit(LOSSYTX, &con->state);
+
 		prepare_read_tag(con);
 		break;