common/config,mgr: fix config for new encode/decode syntax

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

diff --git a/src/common/config.cc b/src/common/config.cc
index 35d43c306d7ba574778e734ce4b0895ee7e63f06..7f8005617640141a792ad2f99ff101585c7d4d78 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -898,20 +898,20 @@ void md_config_t::get_defaults_bl(bufferlist *bl)
     bufferlist bl;
     for (const auto &i : schema) {
       ++n;
-      ::encode(i.second.name, bl);
+      encode(i.second.name, bl);
       auto j = values.find(i.second.name);
       if (j != values.end()) {
        auto k = j->second.find(CONF_DEFAULT);
        if (k != j->second.end()) {
-         ::encode(stringify(k->second), bl);
+         encode(stringify(k->second), bl);
          continue;
        }
       }
       string val;
       conf_stringify(_get_val_default(i.second), &val);
-      ::encode(val, bl);
+      encode(val, bl);
     }
-    ::encode(n, defaults_bl);
+    encode(n, defaults_bl);
     defaults_bl.claim_append(bl);
   }
   *bl = defaults_bl;
@@ -929,11 +929,11 @@ void md_config_t::get_config_bl(bufferlist *bl)
        continue;
       }
       ++n;
-      ::encode(i.first, bl);
-      ::encode((uint32_t)i.second.size(), bl);
+      encode(i.first, bl);
+      encode((uint32_t)i.second.size(), bl);
       for (auto& j : i.second) {
-       ::encode(j.first, bl);
-       ::encode(stringify(j.second), bl);
+       encode(j.first, bl);
+       encode(stringify(j.second), bl);
       }
     }
     // make sure overridden items appear, and include the default value
@@ -950,16 +950,16 @@ void md_config_t::get_config_bl(bufferlist *bl)
        continue;
       }
       ++n;
-      ::encode(i.first, bl);
-      ::encode((uint32_t)1, bl);
-      ::encode((int32_t)CONF_DEFAULT, bl);
+      encode(i.first, bl);
+      encode((uint32_t)1, bl);
+      encode((int32_t)CONF_DEFAULT, bl);
       string val;
       conf_stringify(_get_val_default(*opt), &val);
-      ::encode(val, bl);
+      encode(val, bl);
     }
-    ::encode(n, values_bl);
+    encode(n, values_bl);
     values_bl.claim_append(bl);
-    ::encode(ignored_mon_values, values_bl);
+    encode(ignored_mon_values, values_bl);
   }
   *bl = values_bl;
 }

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 7715a48098f534df51c608f75a4404b76945829b..ea3f700fe5cba8feffe469504043b157778f5852 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -392,8 +392,8 @@ bool DaemonServer::handle_open(MMgrOpen *m)
 
     auto p = m->config_bl.begin();
     if (p != m->config_bl.end()) {
-      ::decode(daemon->config, p);
-      ::decode(daemon->ignored_mon_config, p);
+      decode(daemon->config, p);
+      decode(daemon->ignored_mon_config, p);
       dout(20) << " got config " << daemon->config
               << " ignored " << daemon->ignored_mon_config << dendl;
     }
@@ -506,8 +506,8 @@ bool DaemonServer::handle_report(MMgrReport *m)
 
     auto p = m->config_bl.begin();
     if (p != m->config_bl.end()) {
-      ::decode(daemon->config, p);
-      ::decode(daemon->ignored_mon_config, p);
+      decode(daemon->config, p);
+      decode(daemon->ignored_mon_config, p);
       dout(20) << " got config " << daemon->config
               << " ignored " << daemon->ignored_mon_config << dendl;
     }

diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h
index 8ff21144ff3f5bd767fd36334bd0381bc774a356..545d4b1bebcbbf689f2c2ed3b45d92ef534d4b28 100644 (file)
--- a/src/mgr/DaemonState.h
+++ b/src/mgr/DaemonState.h
@@ -129,7 +129,7 @@ class DaemonState
        config_defaults_bl.length()) {
       auto p = config_defaults_bl.begin();
       try {
-       ::decode(config_defaults, p);
+       decode(config_defaults, p);
       } catch (buffer::error e) {
       }
     }