]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: remove unused variable in do_proxy_write 17391/head
authormyoungwon oh <omwmw@sk.com>
Thu, 31 Aug 2017 08:40:22 +0000 (17:40 +0900)
committermyoungwon oh <omwmw@sk.com>
Thu, 31 Aug 2017 08:40:22 +0000 (17:40 +0900)
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h

index d05ced7d46cfd0fbd37499f395f22e72518e90db..193c44e7f05a935fc0f8be45a299a2fc6d7d2cc2 100644 (file)
@@ -2374,7 +2374,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_manifest_detail(
   switch (obc->obs.oi.manifest.type) {
   case object_manifest_t::TYPE_REDIRECT:
     if (op->may_write() || write_ordered) {
-      do_proxy_write(op, obc->obs.oi.soid, obc);
+      do_proxy_write(op, obc);
     } else {
       do_proxy_read(op, obc);
     }
@@ -2528,7 +2528,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_cache_detail(
 
     if (op->may_write() || op->may_cache()) {
       if (can_proxy_write) {
-        do_proxy_write(op, missing_oid);
+        do_proxy_write(op);
       } else {
        // promote if can't proxy the write
        promote_object(obc, missing_oid, oloc, op, promote_obc);
@@ -2606,7 +2606,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_cache_detail(
     if (!must_promote) {
       if (op->may_write() || op->may_cache() || write_ordered) {
        if (can_proxy_write) {
-         do_proxy_write(op, missing_oid);
+         do_proxy_write(op);
          return cache_result_t::HANDLED_PROXY;
        }
       } else {
@@ -2955,7 +2955,7 @@ struct C_ProxyWrite_Commit : public Context {
   }
 };
 
-void PrimaryLogPG::do_proxy_write(OpRequestRef op, const hobject_t& missing_oid, ObjectContextRef obc)
+void PrimaryLogPG::do_proxy_write(OpRequestRef op, ObjectContextRef obc)
 {
   // NOTE: non-const because ProxyWriteOp takes a mutable ref
   MOSDOp *m = static_cast<MOSDOp*>(op->get_nonconst_req());
index a4d34d17141d29b52d4d458e3f5ad78afbc579c6..572afeadb431fa953b27bd1869a51d1d3c726727 100644 (file)
@@ -1360,7 +1360,7 @@ protected:
   // -- proxywrite --
   map<ceph_tid_t, ProxyWriteOpRef> proxywrite_ops;
 
-  void do_proxy_write(OpRequestRef op, const hobject_t& missing_oid, ObjectContextRef obc = NULL);
+  void do_proxy_write(OpRequestRef op, ObjectContextRef obc = NULL);
   void finish_proxy_write(hobject_t oid, ceph_tid_t tid, int r);
   void cancel_proxy_write(ProxyWriteOpRef pwop);