RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd/object_map: make object map in handle_load_object_map() local

Browse Source 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2024-01-04 11:44:46 +01:00
parent 275a299cd4
commit 232ad1a5fb
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librbd/object_map/DiffRequest.cc
View File

@ -185,13 +185,14 @@ void DiffRequest<I>::handle_load_object_map(int r) {
auto cct = m_image_ctx->cct;
ldout(cct, 10) << "r=" << r << dendl;
if (r == 0) {
auto bl_it = m_out_bl.cbegin();
r = cls_client::object_map_load_finish(&bl_it, &m_object_map);
}
BitVector<2> object_map;
std::string oid(ObjectMap<>::object_map_name(m_image_ctx->id,
m_current_snap_id));
if (r == 0) {
auto bl_it = m_out_bl.cbegin();
r = cls_client::object_map_load_finish(&bl_it, &object_map);
}
if (r == -ENOENT && m_ignore_enoent) {
ldout(cct, 10) << "object map " << oid << " does not exist" << dendl;
@ -207,9 +208,9 @@ void DiffRequest<I>::handle_load_object_map(int r) {
uint64_t num_objs = Striper::get_num_objects(m_image_ctx->layout,
m_current_size);
if (m_object_map.size() < num_objs) {
if (object_map.size() < num_objs) {
ldout(cct, 1) << "object map too small: "
<< m_object_map.size() << " < " << num_objs << dendl;
<< object_map.size() << " < " << num_objs << dendl;
finish(-EINVAL);
return;
}
@ -237,7 +238,7 @@ void DiffRequest<I>::handle_load_object_map(int r) {
uint64_t overlap = std::min(m_object_diff_state->size(),
prev_object_diff_state_size);
auto it = m_object_map.begin() + start_object_no;
auto it = object_map.begin() + start_object_no;
auto diff_it = m_object_diff_state->begin();
uint64_t ono = start_object_no;
for (; ono < start_object_no + overlap; ++diff_it, ++ono) {

2
src/librbd/object_map/DiffRequest.h
View File

@ -68,8 +68,6 @@ private:
uint64_t m_current_size = 0;
BitVector<2> m_object_map;
bufferlist m_out_bl;
bool is_diff_iterate() const;