From: myoungwon oh <omwmw@sk.com>
Date: Tue, 15 May 2018 08:47:56 +0000 (+0900)
Subject: osd: use null if on_finisher is not needed
X-Git-Tag: v14.0.1~1185^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=31333922a065a7318e7a6142bd74008421aa4955;p=ceph-ci.git

osd: use null if on_finisher is not needed

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 769133244ca..ada1f92f349 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -3454,10 +3454,17 @@ void PrimaryLogPG::refcount_manifest(ObjectContextRef obc, object_locator_t oloc
   }                                                     
   
   unsigned n = info.pgid.hash_to_shard(osd->m_objecter_finishers);
+  Context *c;
+  if (cb) {
+    c = new C_OnFinisher(cb, osd->objecter_finishers[n]);
+  } else {
+    c = NULL;
+  }
+
   osd->objecter->mutate(
     soid.oid, oloc, obj_op, snapc,
     ceph::real_clock::from_ceph_timespec(obc->obs.oi.mtime),
-    flags, new C_OnFinisher(cb, osd->objecter_finishers[n]));
+    flags, c);
 }  
 
 void PrimaryLogPG::do_proxy_chunked_read(OpRequestRef op, ObjectContextRef obc, int op_index,