Re: [ 117/171] libceph: drop ceph_con_get/put helpers and nref member
From: Herton Ronaldo Krzesinski <hidden>
Date: 2012-11-23 13:41:53
Also in:
lkml
On Wed, Nov 21, 2012 at 04:41:03PM -0800, Greg Kroah-Hartman wrote:
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sage Weil <redacted> (cherry picked from commit d59315ca8c0de00df9b363f94a2641a30961ca1c) These are no longer used. Every ceph_connection instance is embedded in another structure, and refcounts manipulated via the get/put ops. Signed-off-by: Sage Weil <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[...]
/*
- * generic get/put
- */
-struct ceph_connection *ceph_con_get(struct ceph_connection *con)
-{
- int nref = __atomic_add_unless(&con->nref, 1, 0);
-
- dout("con_get %p nref = %d -> %d\n", con, nref, nref + 1);
-
- return nref ? con : NULL;
-}
-
-void ceph_con_put(struct ceph_connection *con)
-{
- int nref = atomic_dec_return(&con->nref);
-
- BUG_ON(nref < 0);
- if (nref == 0) {
- BUG_ON(con->sock);
- kfree(con);
- }
- dout("con_put %p nref = %d -> %d\n", con, nref + 1, nref);
-}
-
-/*
* initialize a new connection.
Although harmless in functionality not having it, may be it would be
good to also apply with this also the following commit:
commit 261030215d970c62f799e6e508e3c68fc7ec2aa9
Author: Alex Elder [off-list ref]
Date: Thu Jun 21 12:49:23 2012 -0700
libceph: drop declaration of ceph_con_get()
For some reason the declaration of ceph_con_get() and
ceph_con_put() did not get deleted in this commit:
d59315ca libceph: drop ceph_con_get/put helpers and nref member
Clean that up.
--
[]'s
Herton