Skip to content

Commit a3e9931

Browse files
authored
Merge pull request ceph#55599 from ifed01/wip-ifed-kill-build-warns
os/bluestore: eliminate build warnings Reviewed-by: Ronen Friedman <[email protected]> Reviewed-by: Adam Kupczyk <[email protected]>
2 parents 58b2460 + 7e153ba commit a3e9931

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/os/bluestore/BlueStore.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2862,7 +2862,7 @@ uint32_t BlueStore::Blob::merge_blob(CephContext* cct, Blob* blob_to_dissolve)
28622862
auto buf = src->bc.buffer_map.extract(src->bc.buffer_map.cbegin());
28632863
buf.mapped().space = &dst->bc;
28642864
if (dst->bc.buffer_map.count(buf.key()) == 0) {
2865-
dst->bc.buffer_map.insert({buf.key(), std::move(buf.mapped())});
2865+
dst->bc.buffer_map.emplace(buf.key(), std::move(buf.mapped()));
28662866
}
28672867
}
28682868
// move BufferSpace writing

src/os/bluestore/BlueStore.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ class BlueStore : public ObjectStore,
10731073

10741074
void bound_encode_spanning_blobs(size_t& p);
10751075
void encode_spanning_blobs(ceph::buffer::list::contiguous_appender& p);
1076-
BlobRef get_spanning_blob(int id) {
1076+
BlobRef& get_spanning_blob(int id) {
10771077
auto p = spanning_blob_map.find(id);
10781078
ceph_assert(p != spanning_blob_map.end());
10791079
return p->second;
@@ -1479,19 +1479,19 @@ class BlueStore : public ObjectStore,
14791479
_trim_to(0);
14801480
}
14811481

1482-
virtual void shift_bins() {
1482+
void shift_bins() {
14831483
std::lock_guard l(lock);
14841484
age_bins.push_front(std::make_shared<int64_t>(0));
14851485
}
1486-
virtual uint32_t get_bin_count() {
1486+
uint32_t get_bin_count() {
14871487
std::lock_guard l(lock);
14881488
return age_bins.capacity();
14891489
}
1490-
virtual void set_bin_count(uint32_t count) {
1490+
void set_bin_count(uint32_t count) {
14911491
std::lock_guard l(lock);
14921492
age_bins.set_capacity(count);
14931493
}
1494-
virtual uint64_t sum_bins(uint32_t start, uint32_t end) {
1494+
uint64_t sum_bins(uint32_t start, uint32_t end) {
14951495
std::lock_guard l(lock);
14961496
auto size = age_bins.size();
14971497
if (size < start) {

0 commit comments

Comments
 (0)