Merge pull request #1211 from ceph/wip-memstore

memstore: fix touch double-allocation

Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Sage Weil 2014-02-11 21:10:08 -08:00
commit 7709d19f65

View File

@ -1012,8 +1012,9 @@ int MemStore::_touch(coll_t cid, const ghobject_t& oid)
ObjectRef o = c->get_object(oid);
if (!o) {
c->object_map[oid].reset(new Object);
c->object_hash[oid].reset(new Object);
o.reset(new Object);
c->object_map[oid] = o;
c->object_hash[oid] = o;
}
return 0;
}