mgr: Use unqualified encode/decode

This is a portion of Part 1 of the namespace project: using ADL
properly in encode and decode so we can use namespaces easily in Ceph.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index d4ab6fd1a3460595366bd0ee183ce66b5c802f65..3d7ff60f11a2d47c25dd42fa8268f86638203061 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -179,7 +179,7 @@ bool DaemonServer::ms_verify_authorizer(Connection *con,
       bufferlist::iterator p = caps_info.caps.begin();
       string str;
       try {
-       ::decode(str, p);
+       decode(str, p);
       }
       catch (buffer::error& e) {
         is_valid = false;
@@ -1427,7 +1427,7 @@ void DaemonServer::send_report()
        _prune_pending_service_map();
        if (pending_service_map_dirty >= pending_service_map.epoch) {
          pending_service_map.modified = ceph_clock_now();
-         ::encode(pending_service_map, m->service_map_bl, CEPH_FEATURES_ALL);
+         encode(pending_service_map, m->service_map_bl, CEPH_FEATURES_ALL);
          dout(10) << "sending service_map e" << pending_service_map.epoch
                   << dendl;
          pending_service_map.epoch++;

diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index a7b8f572e1614b3f0a0b420f7685ccdeccb5ecaa..313ba807666775fef60c237510f56d4879d06daa 100644 (file)
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -150,10 +150,10 @@ void DaemonPerfCounters::update(MMgrReport *report)
     uint64_t avgcount = 0;
     uint64_t avgcount2 = 0;
 
-    ::decode(val, p);
+    decode(val, p);
     if (t.type & PERFCOUNTER_LONGRUNAVG) {
-      ::decode(avgcount, p);
-      ::decode(avgcount2, p);
+      decode(avgcount, p);
+      decode(avgcount2, p);
     }
     // TODO: interface for insertion of avgs
     instances[t_path].push(now, val);

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index 33d467303eb0a80fa3ed9a10bac4fdd64857f3d1..0c8246dd0611f27f143591ac89e58511842a92dc 100644 (file)
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -297,10 +297,10 @@ void MgrClient::send_report()
        session->declared.insert(path);
       }
 
-      ::encode(static_cast<uint64_t>(data.u64), report->packed);
+      encode(static_cast<uint64_t>(data.u64), report->packed);
       if (data.type & PERFCOUNTER_LONGRUNAVG) {
-        ::encode(static_cast<uint64_t>(data.avgcount), report->packed);
-        ::encode(static_cast<uint64_t>(data.avgcount2), report->packed);
+        encode(static_cast<uint64_t>(data.avgcount), report->packed);
+        encode(static_cast<uint64_t>(data.avgcount2), report->packed);
       }
     }
     ENCODE_FINISH(report->packed);

diff --git a/src/mgr/PyOSDMap.cc b/src/mgr/PyOSDMap.cc
index 8bae2e4b532d82786bceaa677d23bd7639bcaa84..925126a7175a1a633e8d662a7c9bd239e216bb54 100644 (file)
--- a/src/mgr/PyOSDMap.cc
+++ b/src/mgr/PyOSDMap.cc
@@ -359,7 +359,7 @@ static PyObject *osdmap_inc_set_compat_weight_set_weights(
   CrushWrapper crush;
   assert(self->inc->crush.length());  // see new_incremental
   auto p = self->inc->crush.begin();
-  ::decode(crush, p);
+  decode(crush, p);
   crush.create_choose_args(CrushWrapper::DEFAULT_CHOOSE_ARGS, 1);
   for (auto i : wm) {
     crush.choose_args_adjust_item_weightf(

diff --git a/src/mgr/ServiceMap.cc b/src/mgr/ServiceMap.cc
index 9074e2f8716fc1e252f8652c5133ebc58d42ae0d..cde279efc5c611039f0bc29e418984251f09e0dc 100644 (file)
--- a/src/mgr/ServiceMap.cc
+++ b/src/mgr/ServiceMap.cc
@@ -10,22 +10,22 @@
 void ServiceMap::Daemon::encode(bufferlist& bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(gid, bl);
-  ::encode(addr, bl, features);
-  ::encode(start_epoch, bl);
-  ::encode(start_stamp, bl);
-  ::encode(metadata, bl);
+  encode(gid, bl);
+  encode(addr, bl, features);
+  encode(start_epoch, bl);
+  encode(start_stamp, bl);
+  encode(metadata, bl);
   ENCODE_FINISH(bl);
 }
 
 void ServiceMap::Daemon::decode(bufferlist::iterator& p)
 {
   DECODE_START(1, p);
-  ::decode(gid, p);
-  ::decode(addr, p);
-  ::decode(start_epoch, p);
-  ::decode(start_stamp, p);
-  ::decode(metadata, p);
+  decode(gid, p);
+  decode(addr, p);
+  decode(start_epoch, p);
+  decode(start_stamp, p);
+  decode(metadata, p);
   DECODE_FINISH(p);
 }
 
@@ -55,16 +55,16 @@ void ServiceMap::Daemon::generate_test_instances(std::list<Daemon*>& ls)
 void ServiceMap::Service::encode(bufferlist& bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(daemons, bl, features);
-  ::encode(summary, bl);
+  encode(daemons, bl, features);
+  encode(summary, bl);
   ENCODE_FINISH(bl);
 }
 
 void ServiceMap::Service::decode(bufferlist::iterator& p)
 {
   DECODE_START(1, p);
-  ::decode(daemons, p);
-  ::decode(summary, p);
+  decode(daemons, p);
+  decode(summary, p);
   DECODE_FINISH(p);
 }
 
@@ -91,18 +91,18 @@ void ServiceMap::Service::generate_test_instances(std::list<Service*>& ls)
 void ServiceMap::encode(bufferlist& bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(epoch, bl);
-  ::encode(modified, bl);
-  ::encode(services, bl, features);
+  encode(epoch, bl);
+  encode(modified, bl);
+  encode(services, bl, features);
   ENCODE_FINISH(bl);
 }
 
 void ServiceMap::decode(bufferlist::iterator& p)
 {
   DECODE_START(1, p);
-  ::decode(epoch, p);
-  ::decode(modified, p);
-  ::decode(services, p);
+  decode(epoch, p);
+  decode(modified, p);
+  decode(services, p);
   DECODE_FINISH(p);
 }