---

yaml --- r: 373364 b: refs/heads/master c: 20e55c4 h: refs/heads/master v: v3
git-mirror · May 2, 2013 · 87f9f6b · 87f9f6b
1 parent 87c3af2
commit 87f9f6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a23083bda56850a1dc0e1c6d270b1f5dc789f07
+refs/heads/master: 20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -2013,7 +2013,6 @@ static int process_connect(struct ceph_connection *con)
 			con->error_msg = "connect authorization failure";
 			return -1;
 		}
-		con->auth_retry = 1;
 		con_out_kvec_reset(con);
 		ret = prepare_write_connect(con);
 		if (ret < 0)
@@ -2099,7 +2098,7 @@ static int process_connect(struct ceph_connection *con)
 
 		WARN_ON(con->state != CON_STATE_NEGOTIATING);
 		con->state = CON_STATE_OPEN;
-
+		con->auth_retry = 0;    /* we authenticated; clear flag */
 		con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
 		con->connect_seq++;
 		con->peer_features = server_feat;