mon/AuthMonitor: drop unused op arg to assign_global_id()

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 216503954866d87faaeb0d02384c916651310201..871b246ddcbfb1e5e1877cf471899179ab1a40f2 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -457,12 +457,13 @@ bool AuthMonitor::prepare_update(MonOpRequestRef op)
   }
 }
 
-uint64_t AuthMonitor::assign_global_id(MonOpRequestRef op, bool should_increase_max)
+uint64_t AuthMonitor::assign_global_id(bool should_increase_max)
 {
-  MAuth *m = static_cast<MAuth*>(op->get_req());
   int total_mon = mon->monmap->size();
-  dout(10) << "AuthMonitor::assign_global_id m=" << *m << " mon=" << mon->rank << "/" << total_mon
-          << " last_allocated=" << last_allocated_id << " max_global_id=" <<  max_global_id << dendl;
+  dout(10) << "AuthMonitor::assign_global_id mon=" << mon->rank
+          << "/" << total_mon
+          << " last_allocated=" << last_allocated_id
+          << " max_global_id=" <<  max_global_id << dendl;
 
   uint64_t next_global_id = last_allocated_id + 1;
   int remainder = next_global_id % total_mon;
@@ -608,7 +609,7 @@ bool AuthMonitor::prep_auth(MonOpRequestRef op, bool paxos_writable)
      request. If a client tries to send it later, it'll screw up its auth
      session */
   if (!s->con->peer_global_id) {
-    s->con->peer_global_id = assign_global_id(op, paxos_writable);
+    s->con->peer_global_id = assign_global_id(paxos_writable);
     if (!s->con->peer_global_id) {
 
       delete s->auth_handler;

diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index 89c548cf079a00c6f0e4bd3f35453b2702a65df0..208871a9cd550c59225353bf7138164c1c72a712 100644 (file)
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -143,7 +143,7 @@ private:
   void create_pending() override;  // prepare a new pending
   bool prepare_global_id(MonOpRequestRef op);
   void increase_max_global_id();
-  uint64_t assign_global_id(MonOpRequestRef op, bool should_increase_max);
+  uint64_t assign_global_id(bool should_increase_max);
   // propose pending update to peers
   void encode_pending(MonitorDBStore::TransactionRef t) override;
   void encode_full(MonitorDBStore::TransactionRef t) override;