]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Call get_json_str_map under wth_val
authorAdam C. Emerson <aemerson@redhat.com>
Mon, 20 Nov 2017 21:11:00 +0000 (16:11 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 7 Dec 2017 20:46:11 +0000 (15:46 -0500)
To avoid temporary heap allocations.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/mon/OSDMonitor.cc

index 4ec000eac50f346123e478cfe0f3b30512c377fa..52c5afbb480ede47ea11673e982f36a8815752b7 100644 (file)
@@ -5457,9 +5457,11 @@ int OSDMonitor::parse_erasure_code_profile(const vector<string> &erasure_code_pr
                                           map<string,string> *erasure_code_profile_map,
                                           ostream *ss)
 {
-  int r = get_json_str_map(g_conf->get_val<string>("osd_pool_default_erasure_code_profile"),
-                          *ss,
-                          erasure_code_profile_map);
+  int r = g_conf->with_val<string>("osd_pool_default_erasure_code_profile",
+                                  get_json_str_map,
+                                  *ss,
+                                  erasure_code_profile_map,
+                                  true);
   if (r)
     return r;
   assert((*erasure_code_profile_map).count("plugin"));