From ab1a95b08e5ce4a1578bf80bd9b186c00c6df398 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 31 May 2012 20:27:50 -0700 Subject: [PATCH] --- yaml --- r: 320267 b: refs/heads/master c: ec87ef4309d33bd9c87a53bb5152a86ae7a65f25 h: refs/heads/master i: 320265: 2333a3893bd64f856de3e07b5967f54e1ff21b2f 320263: 4aca7b056ca08fdabbec88ddf058ed25cae2b3fa v: v3 --- [refs] | 2 +- trunk/net/ceph/mon_client.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 711bfb6e282a..1da5fdbbe48d 100644 --- 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 index ac4d6b100730..062b72478077 100644 --- 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,