mon: remove unused variables

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 39186404550bef65213bc8dbc1db2b3f9a3a8733..03994e6be854285e77c6464e8b05942ecdf7f67e 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -156,7 +156,6 @@ void MDSMonitor::_note_beacon(MMDSBeacon *m)
 
 bool MDSMonitor::preprocess_beacon(MMDSBeacon *m)
 {
-  entity_addr_t addr = m->get_orig_source_inst().addr;
   int state = m->get_state();
   uint64_t gid = m->get_global_id();
   version_t seq = m->get_seq();

diff --git a/src/mon/MonCaps.cc b/src/mon/MonCaps.cc
index 7d5418a6967d4eb8b925518db4ab1d7b9a06804f..4f8490b67731c5548c24a22c1c9e97146e6dc9fd 100644 (file)
--- a/src/mon/MonCaps.cc
+++ b/src/mon/MonCaps.cc
@@ -110,9 +110,7 @@ bool MonCaps::parse(bufferlist::iterator& iter)
 
     bool op_allow = false;
     bool op_deny = false;
-    bool cmd_service = false;
     bool any_cmd = false;
-    bool cmd_uid = false;
     bool got_eq = false;
     list<int> services_list;
     list<int> uid_list;
@@ -123,8 +121,6 @@ bool MonCaps::parse(bufferlist::iterator& iter)
       if (init) {
         op_allow = false;
         op_deny = false;
-        cmd_service = false;
-       cmd_uid = false;
         any_cmd = false;
         got_eq = false;
         last_is_comma = false;
@@ -157,12 +153,10 @@ do { \
         } else if ((token.compare("services") == 0) ||
                    (token.compare("service") == 0)) {
           ASSERT_STATE(op_allow || op_deny);
-          cmd_service = true;
           any_cmd = true;
        } else if (token.compare("uid") == 0) {
          ASSERT_STATE(op_allow || op_deny);
          any_cmd = true;
-         cmd_uid = true;
        } else if (is_rwx(token, cap_val)) {
           ASSERT_STATE(op_allow || op_deny);
         } else if (token.compare(";") != 0) {

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5dbed32b79162b81eb199469d84f42a1292dad9b..c5f7e955c54a3a164e5299e7ec609b0bab11d85d 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -130,7 +130,6 @@ bool OSDMonitor::update_from_paxos()
 void OSDMonitor::remove_redundant_pg_temp()
 {
   dout(10) << "remove_redundant_pg_temp" << dendl;
-  bool removed = false;
 
   for (map<pg_t,vector<int> >::iterator p = osdmap.pg_temp.begin();
        p != osdmap.pg_temp.end();
@@ -141,7 +140,6 @@ void OSDMonitor::remove_redundant_pg_temp()
       if (raw_up == p->second) {
        dout(10) << " removing unnecessary pg_temp " << p->first << " -> " << p->second << dendl;
        pending_inc.new_pg_temp[p->first].clear();
-       removed = true;
       }
     }
   }