update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / msg / xio / XioMsg.h

diff --git a/ceph/src/msg/xio/XioMsg.h b/ceph/src/msg/xio/XioMsg.h
index f85950ebc402c6c86bb157fe236761f2c538eb93..99968fd9fb893a8d695713c5093848ed96820b7b 100644 (file)
--- a/ceph/src/msg/xio/XioMsg.h
+++ b/ceph/src/msg/xio/XioMsg.h
@@ -40,7 +40,7 @@ public:
     {
       bl.append(p);
       buffer::list::iterator bl_iter = bl.begin();
-      ::decode(msg_cnt, bl_iter);
+      decode(msg_cnt, bl_iter);
     }
 };
 
@@ -74,31 +74,33 @@ public:
   const buffer::list& get_bl() { encode(bl); return bl; };
 
   inline void encode_hdr(ceph::buffer::list& bl) const {
-    ::encode(tag, bl);
-    ::encode(msg_cnt, bl);
-    ::encode(peer_type, bl);
-    ::encode(addr, bl, features);
-    ::encode(hdr->seq, bl);
-    ::encode(hdr->tid, bl);
-    ::encode(hdr->type, bl);
-    ::encode(hdr->priority, bl);
-    ::encode(hdr->version, bl);
-    ::encode(hdr->front_len, bl);
-    ::encode(hdr->middle_len, bl);
-    ::encode(hdr->data_len, bl);
-    ::encode(hdr->data_off, bl);
-    ::encode(hdr->src.type, bl);
-    ::encode(hdr->src.num, bl);
-    ::encode(hdr->compat_version, bl);
-    ::encode(hdr->crc, bl);
+    using ceph::encode;
+    encode(tag, bl);
+    encode(msg_cnt, bl);
+    encode(peer_type, bl);
+    encode(addr, bl, features);
+    encode(hdr->seq, bl);
+    encode(hdr->tid, bl);
+    encode(hdr->type, bl);
+    encode(hdr->priority, bl);
+    encode(hdr->version, bl);
+    encode(hdr->front_len, bl);
+    encode(hdr->middle_len, bl);
+    encode(hdr->data_len, bl);
+    encode(hdr->data_off, bl);
+    encode(hdr->src.type, bl);
+    encode(hdr->src.num, bl);
+    encode(hdr->compat_version, bl);
+    encode(hdr->crc, bl);
   }
 
   inline void encode_ftr(buffer::list& bl) const {
-    ::encode(ftr->front_crc, bl);
-    ::encode(ftr->middle_crc, bl);
-    ::encode(ftr->data_crc, bl);
-    ::encode(ftr->sig, bl);
-    ::encode(ftr->flags, bl);
+    using ceph::encode;
+    encode(ftr->front_crc, bl);
+    encode(ftr->middle_crc, bl);
+    encode(ftr->data_crc, bl);
+    encode(ftr->sig, bl);
+    encode(ftr->flags, bl);
   }
 
   inline void encode(buffer::list& bl) const {
@@ -107,31 +109,33 @@ public:
   }
 
   inline void decode_hdr(buffer::list::iterator& bl) {
-    ::decode(tag, bl);
-    ::decode(msg_cnt, bl);
-    ::decode(peer_type, bl);
-    ::decode(addr, bl);
-    ::decode(hdr->seq, bl);
-    ::decode(hdr->tid, bl);
-    ::decode(hdr->type, bl);
-    ::decode(hdr->priority, bl);
-    ::decode(hdr->version, bl);
-    ::decode(hdr->front_len, bl);
-    ::decode(hdr->middle_len, bl);
-    ::decode(hdr->data_len, bl);
-    ::decode(hdr->data_off, bl);
-    ::decode(hdr->src.type, bl);
-    ::decode(hdr->src.num, bl);
-    ::decode(hdr->compat_version, bl);
-    ::decode(hdr->crc, bl);
+    using ceph::decode;
+    decode(tag, bl);
+    decode(msg_cnt, bl);
+    decode(peer_type, bl);
+    decode(addr, bl);
+    decode(hdr->seq, bl);
+    decode(hdr->tid, bl);
+    decode(hdr->type, bl);
+    decode(hdr->priority, bl);
+    decode(hdr->version, bl);
+    decode(hdr->front_len, bl);
+    decode(hdr->middle_len, bl);
+    decode(hdr->data_len, bl);
+    decode(hdr->data_off, bl);
+    decode(hdr->src.type, bl);
+    decode(hdr->src.num, bl);
+    decode(hdr->compat_version, bl);
+    decode(hdr->crc, bl);
   }
 
   inline void decode_ftr(buffer::list::iterator& bl) {
-    ::decode(ftr->front_crc, bl);
-    ::decode(ftr->middle_crc, bl);
-    ::decode(ftr->data_crc, bl);
-    ::decode(ftr->sig, bl);
-    ::decode(ftr->flags, bl);
+    using ceph::decode;
+    decode(ftr->front_crc, bl);
+    decode(ftr->middle_crc, bl);
+    decode(ftr->data_crc, bl);
+    decode(ftr->sig, bl);
+    decode(ftr->flags, bl);
   }
 
   inline void decode(buffer::list::iterator& bl) {
@@ -259,7 +263,7 @@ public:
     {
       const entity_inst_t &inst = xcon->get_messenger()->get_myinst();
       hdr.peer_type = inst.name.type();
-      hdr.addr = xcon->get_messenger()->get_myaddr();
+      hdr.addr = xcon->get_messenger()->get_myaddr_legacy();
       hdr.hdr->src.type = inst.name.type();
       hdr.hdr->src.num = inst.name.num();
       hdr.msg_cnt = _ex_cnt+1;