From 8e5d4c66dc99848ac211e2ef790634790c3eb71a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 30 Mar 2015 07:13:43 -0700 Subject: [PATCH] osd: drop unused utime_t now arg to issue_repop Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 9 +++------ src/osd/ReplicatedPG.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 3e5d88f4658cc..8574d35e8a807 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -2233,9 +2233,6 @@ void ReplicatedPG::execute_ctx(OpContext *ctx) ctx->user_at_version = obc->obs.oi.user_version; dout(30) << __func__ << " user_at_version " << ctx->user_at_version << dendl; - // note my stats - utime_t now = ceph_clock_now(cct); - if (op->may_read()) { dout(10) << " taking ondisk_read_lock" << dendl; obc->ondisk_read_lock(); @@ -2359,7 +2356,7 @@ void ReplicatedPG::execute_ctx(OpContext *ctx) repop->src_obc.swap(src_obc); // and src_obc. - issue_repop(repop, now); + issue_repop(repop); eval_repop(repop); repop->put(); @@ -7362,7 +7359,7 @@ void ReplicatedPG::eval_repop(RepGather *repop) } } -void ReplicatedPG::issue_repop(RepGather *repop, utime_t now) +void ReplicatedPG::issue_repop(RepGather *repop) { OpContext *ctx = repop->ctx; const hobject_t& soid = ctx->obs->oi.soid; @@ -7489,7 +7486,7 @@ ReplicatedPG::RepGather *ReplicatedPG::simple_repop_create(ObjectContextRef obc) void ReplicatedPG::simple_repop_submit(RepGather *repop) { dout(20) << __func__ << " " << repop << dendl; - issue_repop(repop, repop->ctx->mtime); + issue_repop(repop); eval_repop(repop); repop->put(); } diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index c213b285558ac..8fb9e2d038736 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -865,7 +865,7 @@ protected: void repop_all_applied(RepGather *repop); void repop_all_committed(RepGather *repop); void eval_repop(RepGather*); - void issue_repop(RepGather *repop, utime_t now); + void issue_repop(RepGather *repop); RepGather *new_repop(OpContext *ctx, ObjectContextRef obc, ceph_tid_t rep_tid); void remove_repop(RepGather *repop); -- 2.39.5