msg: use explicit feature argument instead of Connection*

Use the new argument.  Don't rely on Connection *connection being defined.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

8 files changed, 13 insertions, 13 deletions

diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index 0037850c3f8..ac3df11e047 100644
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -156,7 +156,7 @@ public:
     middle = xattrbl;
 
     // conditionally include flock metadata
-    if (connection->has_feature(CEPH_FEATURE_FLOCK)) {
+    if (features & CEPH_FEATURE_FLOCK) {
       header.version = 2;
       ::encode(flockbl, payload);
     }
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index 14e5f1ffe9f..9327227d5fc 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -49,8 +49,8 @@ public:
     realms.push_back(r);
   }
 
-    if (connection->has_feature(CEPH_FEATURE_FLOCK)) {
   void encode_payload(CephContext *cct, uint64_t features) {
+    if (features & CEPH_FEATURE_FLOCK) {
       // new protocol
       header.version = 2;
       ::encode(caps, data);
diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index 390312b2da7..0bd0d480fec 100644
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -82,7 +82,7 @@ public:
   void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(epoch, payload);
-    if (connection && !connection->has_feature(CEPH_FEATURE_PGID64)) {
+    if ((features & CEPH_FEATURE_PGID64) == 0) {
       // reencode for old clients.
       MDSMap m(cct);
       m.decode(encoded);
diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index 475abe6ea69..1e165d57358 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -88,7 +88,7 @@ public:
   }
 
   void encode_payload(CephContext *cct, uint64_t features) {
-    if (connection->has_feature(CEPH_FEATURE_MONCLOCKCHECK))
+    if (features & CEPH_FEATURE_MONCLOCKCHECK)
       header.version = 1;
     ::encode(epoch, payload);
     ::encode(op, payload);
@@ -99,7 +99,7 @@ public:
     ::encode(pn, payload);
     ::encode(uncommitted_pn, payload);
     ::encode(lease_timestamp, payload);
-    if (connection->has_feature(CEPH_FEATURE_MONCLOCKCHECK))
+    if (features & CEPH_FEATURE_MONCLOCKCHECK)
       ::encode(sent_timestamp, payload);
     ::encode(latest_version, payload);
     ::encode(latest_value, payload);
diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h
index 46557d3a7dc..1a4bb9f5631 100644
--- a/src/messages/MMonSubscribe.h
+++ b/src/messages/MMonSubscribe.h
@@ -69,7 +69,7 @@ public:
     }
   }
   void encode_payload(CephContext *cct, uint64_t features) {
-    if (get_connection()->has_feature(CEPH_FEATURE_SUBSCRIBE2)) {
+    if (features & CEPH_FEATURE_SUBSCRIBE2) {
       header.version = 2;
       ::encode(what, payload);
     } else {
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 500f24c72df..3b450e4c4f5 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -82,8 +82,8 @@ public:
   void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     header.version = 2;
-    if (connection && (!connection->has_feature(CEPH_FEATURE_PGID64) ||
-		       !connection->has_feature(CEPH_FEATURE_PGPOOL3))) {
+    if ((features & CEPH_FEATURE_PGID64) == 0 ||
+	(features & CEPH_FEATURE_PGPOOL3) == 0) {
       // reencode maps using old format
       //
       // FIXME: this can probably be done more efficiently higher up
@@ -101,9 +101,9 @@ public:
 	  OSDMap m;
 	  m.decode(inc.fullmap);
 	  inc.fullmap.clear();
-	  m.encode(inc.fullmap, connection->get_features());
+	  m.encode(inc.fullmap, features);
 	}
-	inc.encode(p->second, connection->get_features());
+	inc.encode(p->second, features);
       }
       for (map<epoch_t,bufferlist>::iterator p = maps.begin();
 	   p != maps.end();
@@ -111,7 +111,7 @@ public:
 	OSDMap m;
 	m.decode(p->second);
 	p->second.clear();
-	m.encode(p->second, connection->get_features());
+	m.encode(p->second, features);
       }
       header.version = 1;
     }
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index 3c59fb05d8a..d6864405cc9 100644
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -188,7 +188,7 @@ public:
 
     OSDOp::merge_osd_op_vector_in_data(ops, data);
 
-    if (!connection->has_feature(CEPH_FEATURE_OBJECTLOCATOR)) {
+    if ((features & CEPH_FEATURE_OBJECTLOCATOR) == 0) {
       // here is the old structure we are encoding to: //
 #if 0
 struct ceph_osd_request_head {
diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 84e16eb2687..88cec1149f9 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -112,7 +112,7 @@ public:
 
     OSDOp::merge_osd_op_vector_out_data(ops, data);
 
-    if (!connection->has_feature(CEPH_FEATURE_PGID64)) {
+    if ((features & CEPH_FEATURE_PGID64) == 0) {
       ceph_osd_reply_head head;
       memset(&head, 0, sizeof(head));
       head.layout.ol_pgid = pgid.get_old_pg().v;