diff options
author | Sage Weil <sage@inktank.com> | 2012-06-21 12:49:23 -0700 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2012-06-22 08:13:45 -0500 |
commit | d59315ca8c0de00df9b363f94a2641a30961ca1c (patch) | |
tree | b2e8a2fe8633d6ac194d41e08a8c854719a6fb23 /net/ceph | |
parent | 36eb71aa57e6a33d61fd90a2fd87f00c6844bc86 (diff) | |
download | op-kernel-dev-d59315ca8c0de00df9b363f94a2641a30961ca1c.zip op-kernel-dev-d59315ca8c0de00df9b363f94a2641a30961ca1c.tar.gz |
libceph: drop ceph_con_get/put helpers and nref member
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 <sage@inktank.com>
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/messenger.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index fc0cee7..ab690e2 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -501,30 +501,6 @@ bool ceph_con_opened(struct ceph_connection *con) } /* - * 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. */ void ceph_con_init(struct ceph_connection *con, void *private, @@ -535,7 +511,6 @@ void ceph_con_init(struct ceph_connection *con, void *private, memset(con, 0, sizeof(*con)); con->private = private; con->ops = ops; - atomic_set(&con->nref, 1); con->msgr = msgr; con_sock_state_init(con); @@ -1951,8 +1926,7 @@ static int try_write(struct ceph_connection *con) { int ret = 1; - dout("try_write start %p state %lu nref %d\n", con, con->state, - atomic_read(&con->nref)); + dout("try_write start %p state %lu\n", con, con->state); more: dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes); |