osd, mds, tools: drop the invalid comment and some unused variables

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
(cherry picked from commit 2e93424167de15e91394169f4395f5f446e710e2)

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 3d34bd4c1caa0f45835b4af664da5215d5a5b4fc..f187954382344166c7281d5515cab7b0fe7c112b 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -618,9 +618,7 @@ void Server::finish_force_open_sessions(map<client_t,entity_inst_t>& cm,
           << " initial v " << mds->sessionmap.get_version() << dendl;
   
 
-  int sessions_inserted = 0;
   for (map<client_t,entity_inst_t>::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 332b65709a7652604f8a96df6165e36aa4f09581..7cb8bdfef6503fdc36ff0161a724940914381d67 100644 (file)
--- 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<const MOSDOp*>(op->get_req())->get_reqid();
-  ObjectContextRef obc;
   mempool::osd_pglog::list<pg_log_entry_t> 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 52048eb8f018b3e2deefc35c1480e2ffb6476259..7cb1df40c63a6f84b70ff586ee73437adc3ad332 100644 (file)
--- 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 742f49f1006e4b1dca4f981fcd298e0f22243ab1..0e1473a9509a0e0424725d69f86b2ceabe79b2c4 100644 (file)
--- 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")