---

yaml --- r: 320267 b: refs/heads/master c: ec87ef4 h: refs/heads/master i: 320265: 2333a38 320263: 4aca7b0 v: v3
git-mirror · Jun 6, 2012 · ab1a95b · ab1a95b
1 parent 43d50e1
commit ab1a95b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67130934fb579fdf0f2f6d745960264378b57dc8
+refs/heads/master: ec87ef4309d33bd9c87a53bb5152a86ae7a65f25
diff --git a/trunk/net/ceph/mon_client.c b/trunk/net/ceph/mon_client.c
@@ -1029,9 +1029,23 @@ static void mon_fault(struct ceph_connection *con)
 	mutex_unlock(&monc->mutex);
 }
 
+/*
+ * We can ignore refcounting on the connection struct, as all references
+ * will come from the messenger workqueue, which is drained prior to
+ * mon_client destruction.
+ */
+static struct ceph_connection *con_get(struct ceph_connection *con)
+{
+	return con;
+}
+
+static void con_put(struct ceph_connection *con)
+{
+}
+
 static const struct ceph_connection_operations mon_con_ops = {
-	.get = ceph_con_get,
-	.put = ceph_con_put,
+	.get = con_get,
+	.put = con_put,
 	.dispatch = dispatch,
 	.fault = mon_fault,
 	.alloc_msg = mon_alloc_msg,