From: Igor Fedotov Date: Thu, 15 Feb 2024 12:00:42 +0000 (+0300) Subject: os/bluestore: eliminate build warnings X-Git-Tag: testing/wip-batrick-testing-20240411.154038~129^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e13f936171cfb3d6cbb2264effbc1de369fccdc;p=ceph-ci.git os/bluestore: eliminate build warnings Signed-off-by: Igor Fedotov --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 29aff834fa4..ed4f4a93a85 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -2865,7 +2865,7 @@ uint32_t BlueStore::Blob::merge_blob(CephContext* cct, Blob* blob_to_dissolve) auto buf = src->bc.buffer_map.extract(src->bc.buffer_map.cbegin()); buf.mapped().space = &dst->bc; if (dst->bc.buffer_map.count(buf.key()) == 0) { - dst->bc.buffer_map.insert({buf.key(), std::move(buf.mapped())}); + dst->bc.buffer_map.emplace(buf.key(), std::move(buf.mapped())); } } // move BufferSpace writing diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index f9dba48220c..80537058c8d 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -1049,7 +1049,7 @@ public: void bound_encode_spanning_blobs(size_t& p); void encode_spanning_blobs(ceph::buffer::list::contiguous_appender& p); - BlobRef get_spanning_blob(int id) { + BlobRef& get_spanning_blob(int id) { auto p = spanning_blob_map.find(id); ceph_assert(p != spanning_blob_map.end()); return p->second;