From 94090379a13639ce0a8619dfe178cc62acdd8fc4 Mon Sep 17 00:00:00 2001 From: Luo Kexue Date: Mon, 28 Aug 2017 09:24:10 +0800 Subject: [PATCH] osd, mds, tools: drop the invalid comment and some unused variables Signed-off-by: Luo Kexue (cherry picked from commit 2e93424167de15e91394169f4395f5f446e710e2) --- src/mds/Server.cc | 2 -- src/osd/PrimaryLogPG.cc | 1 - src/osd/ReplicatedBackend.h | 1 - src/tools/ceph_osdomap_tool.cc | 2 +- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 3d34bd4c1caa0..f187954382344 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -618,9 +618,7 @@ void Server::finish_force_open_sessions(map& cm, << " initial v " << mds->sessionmap.get_version() << dendl; - int sessions_inserted = 0; for (map::iterator p = cm.begin(); p != cm.end(); ++p) { - sessions_inserted++; Session *session = mds->sessionmap.get_session(p->second.name); assert(session); diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 332b65709a765..7cb8bdfef6503 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -2395,7 +2395,6 @@ void PrimaryLogPG::record_write_error(OpRequestRef op, const hobject_t &soid, dout(20) << __func__ << " r=" << r << dendl; assert(op->may_write()); const osd_reqid_t &reqid = static_cast(op->get_req())->get_reqid(); - ObjectContextRef obc; mempool::osd_pglog::list entries; entries.push_back(pg_log_entry_t(pg_log_entry_t::ERROR, soid, get_next_version(), eversion_t(), 0, diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index 52048eb8f018b..7cb1df40c63a6 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -58,7 +58,6 @@ public: void check_recovery_sources(const OSDMapRef& osdmap) override; - /// @see PGBackend::delay_message_until_active bool can_handle_while_inactive(OpRequestRef op) override; /// @see PGBackend::handle_message diff --git a/src/tools/ceph_osdomap_tool.cc b/src/tools/ceph_osdomap_tool.cc index 742f49f1006e4..0e1473a9509a0 100644 --- a/src/tools/ceph_osdomap_tool.cc +++ b/src/tools/ceph_osdomap_tool.cc @@ -27,7 +27,7 @@ using namespace std; int main(int argc, char **argv) { po::options_description desc("Allowed options"); - string store_path, cmd, out_path, oid; + string store_path, cmd, oid; bool debug = false; desc.add_options() ("help", "produce help message") -- 2.39.5