summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-05-04 20:17:26 -0700
committerSage Weil <sage@newdream.net>2012-05-05 16:32:22 -0700
commitb5e9995f59d363ba00d9cac413d9b754ee44e370 (patch)
tree9fcf663fcdb2f8d1bd929cd22b187f6976c49c6b
parent6f3221a9f54abd592f1f073296e13fd98782bff8 (diff)
downloadceph-b5e9995f59d363ba00d9cac413d9b754ee44e370.tar.gz
objectcacher: delete unused onfinish from flush_set
Once upon a time the caller would do this, but none of those have survived, and this makes more sense. Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
-rw-r--r--src/osdc/ObjectCacher.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 1b20fbe7200..41ed4dd712d 100644
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -1427,6 +1427,7 @@ bool ObjectCacher::flush_set(ObjectSet *oset, Context *onfinish)
{
if (oset->objects.empty()) {
ldout(cct, 10) << "flush_set on " << oset << " dne" << dendl;
+ delete onfinish;
return true;
}
@@ -1457,6 +1458,7 @@ 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;
@@ -1468,6 +1470,7 @@ bool ObjectCacher::flush_set(ObjectSet *oset, vector<ObjectExtent>& exv, Context
{
if (oset->objects.empty()) {
ldout(cct, 10) << "flush_set on " << oset << " dne" << dendl;
+ delete onfinish;
return true;
}
@@ -1503,6 +1506,7 @@ bool ObjectCacher::flush_set(ObjectSet *oset, vector<ObjectExtent>& exv, Context
if (safe) {
ldout(cct, 10) << "flush_set " << oset << " has no dirty|tx bhs" << dendl;
+ delete onfinish;
return true;
}
return false;