]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
memstore: fix touch double-allocation 1211/head
authorSage Weil <sage@inktank.com>
Tue, 11 Feb 2014 03:04:35 +0000 (19:04 -0800)
committerSage Weil <sage@inktank.com>
Tue, 11 Feb 2014 03:04:42 +0000 (19:04 -0800)
Reported-by: Allen Samuels <allen.samuels@sandisk.com>
Signed-off-by: Sage Weil <sage@inktank.com>
src/os/MemStore.cc

index fd6a7d5a90c20107b31e72f31402ec7ca933902b..c7361870039016a02d5e1e6a95b7c4caec1fe4d1 100644 (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;
 }