summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-11-29 17:03:30 -0800
committerSage Weil <sage@inktank.com>2012-11-29 17:03:30 -0800
commit0ffafb3106d6f2d7ac7a51720af709596bf50683 (patch)
tree92c4a094807c9453f2adc22797f6f089fd0f31de
parent774d5bf14c4dbc64d3acdffa24df9bca076d8d97 (diff)
downloadceph-0ffafb3106d6f2d7ac7a51720af709596bf50683.tar.gz
Revert "osd: fix leak of heartbeat con on reset"
This reverts commit b31a99abda75b9170a5805b02944a0c0c78245b7.
-rw-r--r--src/osd/OSD.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a252265fe9f..9c57b66c4b8 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2094,8 +2094,6 @@ bool OSD::heartbeat_reset(Connection *con)
return true;
}
dout(10) << "heartbeat_reset reopen failed hb con " << con << dendl;
- if (p->second.con)
- p->second.con->put();
p->second.con = newcon;
p->second.con->set_priv(s);
} else {