From: Sage Weil <sage@inktank.com>
Date: Sun, 18 Nov 2012 16:19:41 +0000 (-0800)
Subject: mon: drop con->session reference in remove_session()
X-Git-Tag: v0.55~76^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=005967d2565a893550d8c664a57d4536e131734f;p=ceph.git

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 691a782a2526..469cbd03aa52 100644
--- 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;
 }