Merge pull request #12871 from xiexingguo/xxg-wip-bluestore-20170111

os/bluestore: kill BufferSpace.empty()

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-01-10 21:15:35 -06:00 committed by GitHub
commit ab9d375df2
2 changed files with 4 additions and 10 deletions

View File

@ -7514,12 +7514,10 @@ void BlueStore::_dump_extent_map(ExtentMap &em, int log_level)
<< dendl;
}
std::lock_guard<std::recursive_mutex> l(e.blob->shared_blob->bc.cache->lock);
if (!e.blob->shared_blob->bc.empty()) {
for (auto& i : e.blob->shared_blob->bc.buffer_map) {
dout(log_level) << __func__ << " 0x" << std::hex << i.first
<< "~" << i.second->length << std::dec
<< " " << *i.second << dendl;
}
for (auto& i : e.blob->shared_blob->bc.buffer_map) {
dout(log_level) << __func__ << " 0x" << std::hex << i.first
<< "~" << i.second->length << std::dec
<< " " << *i.second << dendl;
}
}
}

View File

@ -273,10 +273,6 @@ public:
return i;
}
bool empty() const {
return buffer_map.empty();
}
// must be called under protection of the Cache lock
void _clear();