mon: drop con->session reference in remove_session()

This captures all callers.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 691a782a2526c42772e5fd96f3fe0b0079037bb9..469cbd03aa52737e26e2e9ce726f00c6bf72669f 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1826,6 +1826,7 @@ void Monitor::remove_session(MonSession *s)
       routed_requests.erase(*p);
     }
   }
+  s->con->set_priv(NULL);
   session_map.remove_session(s);
 }
 
@@ -2196,9 +2197,6 @@ bool Monitor::ms_handle_reset(Connection *con)
   if (!s->closed)
     remove_session(s);
   s->put();
-    
-  // remove from connection, too.
-  con->set_priv(NULL);
   return true;
 }