From: Sage Weil <sage@inktank.com>
Date: Tue, 11 Jun 2013 06:21:50 +0000 (-0700)
Subject: osd: fix con -> session ref change after hb reset
X-Git-Tag: v0.64~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f2017fb1797333232b802cac5f9cdc2338723fe;p=ceph.git

osd: fix con -> session ref change after hb reset

set_priv() expects to be given a reference to own; take one.  This fixes
various crashes after we see a hb connection reset.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 66b3a58eb518..d66e9841d42f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2642,7 +2642,7 @@ bool OSD::heartbeat_reset(Connection *con)
       if (newcon.first) {
 	p->second.con_back = newcon.first.get();
 	p->second.con_back->get();
-	p->second.con_back->set_priv(s);
+	p->second.con_back->set_priv(s->get());
 	if (newcon.second) {
 	  p->second.con_front = newcon.second.get();
 	  p->second.con_front->get();