Commit d59315ca authored by Sage Weil's avatar Sage Weil Committed by Alex Elder

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: default avatarSage Weil <sage@inktank.com>
parent 36eb71aa
...@@ -135,7 +135,6 @@ struct ceph_msg_pos { ...@@ -135,7 +135,6 @@ struct ceph_msg_pos {
*/ */
struct ceph_connection { struct ceph_connection {
void *private; void *private;
atomic_t nref;
const struct ceph_connection_operations *ops; const struct ceph_connection_operations *ops;
......
...@@ -500,30 +500,6 @@ bool ceph_con_opened(struct ceph_connection *con) ...@@ -500,30 +500,6 @@ bool ceph_con_opened(struct ceph_connection *con)
return con->connect_seq > 0; return con->connect_seq > 0;
} }
/*
* 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. * initialize a new connection.
*/ */
...@@ -535,7 +511,6 @@ 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)); memset(con, 0, sizeof(*con));
con->private = private; con->private = private;
con->ops = ops; con->ops = ops;
atomic_set(&con->nref, 1);
con->msgr = msgr; con->msgr = msgr;
con_sock_state_init(con); con_sock_state_init(con);
...@@ -1951,8 +1926,7 @@ static int try_write(struct ceph_connection *con) ...@@ -1951,8 +1926,7 @@ static int try_write(struct ceph_connection *con)
{ {
int ret = 1; int ret = 1;
dout("try_write start %p state %lu nref %d\n", con, con->state, dout("try_write start %p state %lu\n", con, con->state);
atomic_read(&con->nref));
more: more:
dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes); dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment