From: Adam C. Emerson <aemerson@redhat.com>
Date: Mon, 20 Nov 2017 21:14:18 +0000 (-0500)
Subject: os/bluestore: Call get_str_map under with_val
X-Git-Tag: wip-pdonnell-testing-20180317.202121~845^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f6173b6a9c1d30878ddb08f8498a3bfa8bb6ad3c;p=ceph-ci.git

os/bluestore: Call get_str_map under with_val

Another heap allocation bites the dust.

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 04cdedb9573..db500c5d6f7 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4785,8 +4785,10 @@ int BlueStore::_open_db(bool create, bool to_repair_db)
     options = cct->_conf->bluestore_rocksdb_options;
 
     map<string,string> cf_map;
-    get_str_map(cct->_conf->get_val<string>("bluestore_rocksdb_cfs"), &cf_map,
-		" \t");
+    cct->_conf->with_val<string>("bluestore_rocksdb_cfs",
+                                 get_str_map,
+                                 &cf_map,
+                                 " \t");
     for (auto& i : cf_map) {
       dout(10) << "column family " << i.first << ": " << i.second << dendl;
       cfs.push_back(KeyValueDB::ColumnFamily(i.first, i.second));