From 5e582bc121f6dfcebad8962ff39986388a546a46 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Thu, 31 Aug 2017 17:40:22 +0900 Subject: [PATCH] osd: remove unused variable in do_proxy_write Signed-off-by: Myoungwon Oh --- src/osd/PrimaryLogPG.cc | 8 ++++---- src/osd/PrimaryLogPG.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index d05ced7d46c..193c44e7f05 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -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(op->get_nonconst_req()); diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h index a4d34d17141..572afeadb43 100644 --- a/src/osd/PrimaryLogPG.h +++ b/src/osd/PrimaryLogPG.h @@ -1360,7 +1360,7 @@ protected: // -- proxywrite -- map 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);