From: Samuel Just <sam.just@inktank.com>
Date: Thu, 13 Dec 2012 18:52:28 +0000 (-0800)
Subject: OSD: put connection in disconnect_session_watches as well as the session
X-Git-Tag: v0.56~51^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97cc55d599ea1588af2e73d6972e1c9dfd9a545b;p=ceph.git

OSD: put connection in disconnect_session_watches as well as the session

obc->watchers now has a ref to the connection as well.  This piece of
disconnect_session_watchers essentially parallels remove_watcher and
should generally do the same thing.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2dedaf4049ba..c88dfea4818c 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2463,6 +2463,7 @@ void OSD::disconnect_session_watches(Session *session)
 		 << ", expires " << expire << dendl;
         obc->watchers.erase(witer++);
 	pg->put_object_context(obc);
+	session->con->put();
 	session->put();
       }
       if (witer == obc->watchers.end())