Skip to content

Commit

Permalink
libceph: drop ceph_con_get/put helpers and nref member
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sage Weil authored and Alex Elder committed Jun 22, 2012
1 parent 36eb71a commit d59315c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
1 change: 0 additions & 1 deletion include/linux/ceph/messenger.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ struct ceph_msg_pos {
*/
struct ceph_connection {
void *private;
atomic_t nref;

const struct ceph_connection_operations *ops;

Expand Down
28 changes: 1 addition & 27 deletions net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,30 +500,6 @@ bool ceph_con_opened(struct ceph_connection *con)
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.
*/
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit d59315c

Please sign in to comment.