msgr: drop extra arg

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 6f47f9225118bafecaab8aed70a85a23c641886b..7c638d7f934f1e798a1ff4426ab93b94ccc0890b 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -289,16 +289,14 @@ void SimpleMessenger::Endpoint::dispatch_entry()
           ls.pop_front();
          if ((long)m == BAD_REMOTE_RESET) {
            lock.Lock();
-           Connection *con = remote_reset_q.front().first;
-           entity_addr_t a = remote_reset_q.front().second;
+           Connection *con = remote_reset_q.front();
            remote_reset_q.pop_front();
            lock.Unlock();
            ms_deliver_handle_remote_reset(con);
            con->put();
          } else if ((long)m == BAD_RESET) {
            lock.Lock();
-           Connection *con = reset_q.front().first;
-           entity_addr_t a = reset_q.front().second;
+           Connection *con = reset_q.front();
            reset_q.pop_front();
            lock.Unlock();
            ms_deliver_handle_reset(con);
@@ -1157,7 +1155,7 @@ void SimpleMessenger::Pipe::fail()
 
   for (unsigned i=0; i<rank->local.size(); i++) 
     if (rank->local[i])
-      rank->local[i]->queue_reset(connection_state->get(), peer_addr);
+      rank->local[i]->queue_reset(connection_state->get());
 
   // unregister
   lock.Unlock();
@@ -1175,7 +1173,7 @@ void SimpleMessenger::Pipe::was_session_reset()
   report_failures();
   for (unsigned i=0; i<rank->local.size(); i++) 
     if (rank->local[i])
-      rank->local[i]->queue_remote_reset(connection_state->get(), peer_addr);
+      rank->local[i]->queue_remote_reset(connection_state->get());
 
   out_seq = 0;
   in_seq = 0;

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index ec8f30e0bc6cb3028c4c5aaf5e41c8aa03c4575a..b338f720b8f5204499b5569b5bd9102a3edaffae 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -297,19 +297,19 @@ private:
     }
 
     enum { BAD_REMOTE_RESET, BAD_RESET };
-    list<pair<Connection*,entity_addr_t> > remote_reset_q;
-    list<pair<Connection*,entity_addr_t> > reset_q;
+    list<Connection*> remote_reset_q;
+    list<Connection*> reset_q;
 
-    void queue_remote_reset(Connection *con, entity_addr_t a) {
+    void queue_remote_reset(Connection *con) {
       lock.Lock();
-      remote_reset_q.push_back(pair<Connection*,entity_addr_t>(con, a));
+      remote_reset_q.push_back(con);
       dispatch_queue[CEPH_MSG_PRIO_HIGHEST].push_back((Message*)BAD_REMOTE_RESET);
       cond.Signal();
       lock.Unlock();
     }
-    void queue_reset(Connection *con, entity_addr_t a) {
+    void queue_reset(Connection *con) {
       lock.Lock();
-      reset_q.push_back(pair<Connection*,entity_addr_t>(con, a));
+      reset_q.push_back(con);
       dispatch_queue[CEPH_MSG_PRIO_HIGHEST].push_back((Message*)BAD_RESET);
       cond.Signal();
       lock.Unlock();