RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6963 from liewegas/wip-memstore

Browse Source 
osd: memstore: fix two bugs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Sage Weil 2015-12-19 13:56:32 -05:00
commit ce995d7de9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/MemStore.cc
View File

@ -1024,9 +1024,9 @@ int MemStore::_remove(coll_t cid, const ghobject_t& oid)
auto i = c->object_hash.find(oid);
if (i == c->object_hash.end())
return -ENOENT;
used_bytes -= i->second->get_size();
c->object_hash.erase(i);
c->object_map.erase(oid);
used_bytes -= i->second->get_size();
return 0;
}
@ -1556,10 +1556,10 @@ int MemStore::PageSetObject::clone(Object *src, uint64_t srcoff,
dst_page->data + dbegin - dst_page->offset);
}
dst_pages.clear(); // drop page refs
srcoff += count;
dstoff += count;
len -= count;
}
srcoff += count;
dstoff += count;
len -= count;
tls_pages.clear(); // drop page refs
}