---

yaml --- r: 198086 b: refs/heads/master c: aba558e h: refs/heads/master v: v3
git-mirror · May 17, 2010 · ffa1605 · ffa1605
1 parent 758c0ff
commit ffa1605
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca9d93a292e327bbcddd8f8ea4197397e35097d4
+refs/heads/master: aba558e28ac40a598542d995c09efa8439ee3ed4
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
@@ -1223,6 +1223,7 @@ static int process_connect(struct ceph_connection *con)
 		clear_bit(CONNECTING, &con->state);
 		con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
 		con->connect_seq++;
+		con->peer_features = server_feat;
 		dout("process_connect got READY gseq %d cseq %d (%d)\n",
 		     con->peer_global_seq,
 		     le32_to_cpu(con->in_reply.connect_seq),

diff --git a/trunk/fs/ceph/messenger.h b/trunk/fs/ceph/messenger.h
@@ -142,6 +142,7 @@ struct ceph_connection {
 	struct ceph_entity_addr peer_addr; /* peer address */
 	struct ceph_entity_name peer_name; /* peer name */
 	struct ceph_entity_addr peer_addr_for_me;
+	unsigned peer_features;
 	u32 connect_seq;      /* identify the most recent connection
 				 attempt for this connection, client */
 	u32 peer_global_seq;  /* peer's global seq for this connection */