]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix con -> session ref change after hb reset
authorSage Weil <sage@inktank.com>
Tue, 11 Jun 2013 06:21:50 +0000 (23:21 -0700)
committerSage Weil <sage@inktank.com>
Tue, 11 Jun 2013 06:22:26 +0000 (23:22 -0700)
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>
src/osd/OSD.cc

index 66b3a58eb518c2ce041afb6fd35561aaa9825de6..d66e9841d42fa1a923dda387516430df482ed141 100644 (file)
@@ -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();