From da51582b456d0d92b385cbfe2c268629a743eadd Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 7 Jul 2017 15:45:21 +0800 Subject: [PATCH] mon/OSDMonitor: drop unnecessary parameter now from force_failure() Signed-off-by: xie xingguo --- src/mon/OSDMonitor.cc | 4 ++-- src/mon/OSDMonitor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index be39f521bf43f..a933e149c2701 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1817,7 +1817,7 @@ bool OSDMonitor::check_failure(utime_t now, int target_osd, failure_info_t& fi) return false; } -void OSDMonitor::force_failure(utime_t now, int target_osd, int by) +void OSDMonitor::force_failure(int target_osd, int by) { // already pending failure? if (pending_inc.new_state.count(target_osd) && @@ -1858,7 +1858,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op) if (m->is_immediate()) { mon->clog->debug() << m->get_target() << " reported immediately failed by " << m->get_orig_source_inst(); - force_failure(now, target_osd, reporter); + force_failure(target_osd, reporter); return true; } mon->clog->debug() << m->get_target() << " reported failed by " diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 3f258815a1242..3a9a27f5c37fa 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -147,7 +147,7 @@ public: bool check_failures(utime_t now); bool check_failure(utime_t now, int target_osd, failure_info_t& fi); - void force_failure(utime_t now, int target_osd, int by); + void force_failure(int target_osd, int by); // the time of last msg(MSG_ALIVE and MSG_PGTEMP) proposed without delay utime_t last_attempted_minwait_time; -- 2.39.5