From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 29 Jan 2013 22:22:15 +0000 (-0800)
Subject: ObjectCacher: fix flush_set when no flushing is needed
X-Git-Tag: v0.57~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bc21143552b35698c9916c67494336de8964d2a;p=ceph.git

ObjectCacher: fix flush_set when no flushing is needed

C_GatherBuilder takes ownership of the Context we pass it. Deleting it
in flush_set after constructing the C_GatherBuilder results in a
double delete.

Fixes: #3946
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Sam Lang <sam.lang@inktank.com>
---

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index bf83cfa49c9c..265a806dbb23 100644
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -1495,7 +1495,6 @@ bool ObjectCacher::flush_set(ObjectSet *oset, Context *onfinish)
   
   if (safe) {
     ldout(cct, 10) << "flush_set " << oset << " has no dirty|tx bhs" << dendl;
-    delete onfinish;
     return true;
   }
   return false;