Skip to content

Commit

Permalink
libceph: rename kvec_reset and kvec_add functions
Browse files Browse the repository at this point in the history 
The functions ceph_con_out_kvec_reset() and ceph_con_out_kvec_add()
are entirely private functions, so drop the "ceph_" prefix in their
name to make them slightly more wieldy.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Alex Elder authored and Alex Elder committed Jun 1, 2012
1 parent 327800b commit e220042
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions net/ceph/messenger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,14 +486,14 @@ static u32 get_global_seq(struct ceph_messenger *msgr, u32 gt)
return ret;
}

static void ceph_con_out_kvec_reset(struct ceph_connection *con)
static void con_out_kvec_reset(struct ceph_connection *con)
{
con->out_kvec_left = 0;
con->out_kvec_bytes = 0;
con->out_kvec_cur = &con->out_kvec[0];
}

static void ceph_con_out_kvec_add(struct ceph_connection *con,
static void con_out_kvec_add(struct ceph_connection *con,
size_t size, void *data)
{
int index;
Expand Down Expand Up @@ -534,17 +534,17 @@ static void prepare_write_message(struct ceph_connection *con)
struct ceph_msg *m;
u32 crc;

ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
con->out_kvec_is_msg = true;
con->out_msg_done = false;

/* Sneak an ack in there first? If we can get it into the same
* TCP packet that's a good thing. */
if (con->in_seq > con->in_seq_acked) {
con->in_seq_acked = con->in_seq;
ceph_con_out_kvec_add(con, sizeof (tag_ack), &tag_ack);
con_out_kvec_add(con, sizeof (tag_ack), &tag_ack);
con->out_temp_ack = cpu_to_le64(con->in_seq_acked);
ceph_con_out_kvec_add(con, sizeof (con->out_temp_ack),
con_out_kvec_add(con, sizeof (con->out_temp_ack),
&con->out_temp_ack);
}

Expand Down Expand Up @@ -572,12 +572,12 @@ static void prepare_write_message(struct ceph_connection *con)
BUG_ON(le32_to_cpu(m->hdr.front_len) != m->front.iov_len);

/* tag + hdr + front + middle */
ceph_con_out_kvec_add(con, sizeof (tag_msg), &tag_msg);
ceph_con_out_kvec_add(con, sizeof (m->hdr), &m->hdr);
ceph_con_out_kvec_add(con, m->front.iov_len, m->front.iov_base);
con_out_kvec_add(con, sizeof (tag_msg), &tag_msg);
con_out_kvec_add(con, sizeof (m->hdr), &m->hdr);
con_out_kvec_add(con, m->front.iov_len, m->front.iov_base);

if (m->middle)
ceph_con_out_kvec_add(con, m->middle->vec.iov_len,
con_out_kvec_add(con, m->middle->vec.iov_len,
m->middle->vec.iov_base);

/* fill in crc (except data pages), footer */
Expand Down Expand Up @@ -626,12 +626,12 @@ static void prepare_write_ack(struct ceph_connection *con)
con->in_seq_acked, con->in_seq);
con->in_seq_acked = con->in_seq;

ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);

ceph_con_out_kvec_add(con, sizeof (tag_ack), &tag_ack);
con_out_kvec_add(con, sizeof (tag_ack), &tag_ack);

con->out_temp_ack = cpu_to_le64(con->in_seq_acked);
ceph_con_out_kvec_add(con, sizeof (con->out_temp_ack),
con_out_kvec_add(con, sizeof (con->out_temp_ack),
&con->out_temp_ack);

con->out_more = 1; /* more will follow.. eventually.. */
Expand All @@ -644,8 +644,8 @@ static void prepare_write_ack(struct ceph_connection *con)
static void prepare_write_keepalive(struct ceph_connection *con)
{
dout("prepare_write_keepalive %p\n", con);
ceph_con_out_kvec_reset(con);
ceph_con_out_kvec_add(con, sizeof (tag_keepalive), &tag_keepalive);
con_out_kvec_reset(con);
con_out_kvec_add(con, sizeof (tag_keepalive), &tag_keepalive);
set_bit(WRITE_PENDING, &con->state);
}

Expand Down Expand Up @@ -690,8 +690,8 @@ static struct ceph_auth_handshake *get_connect_authorizer(struct ceph_connection
*/
static void prepare_write_banner(struct ceph_connection *con)
{
ceph_con_out_kvec_add(con, strlen(CEPH_BANNER), CEPH_BANNER);
ceph_con_out_kvec_add(con, sizeof (con->msgr->my_enc_addr),
con_out_kvec_add(con, strlen(CEPH_BANNER), CEPH_BANNER);
con_out_kvec_add(con, sizeof (con->msgr->my_enc_addr),
&con->msgr->my_enc_addr);

con->out_more = 0;
Expand Down Expand Up @@ -738,10 +738,10 @@ static int prepare_write_connect(struct ceph_connection *con)
con->out_connect.authorizer_len = auth ?
cpu_to_le32(auth->authorizer_buf_len) : 0;

ceph_con_out_kvec_add(con, sizeof (con->out_connect),
con_out_kvec_add(con, sizeof (con->out_connect),
&con->out_connect);
if (auth && auth->authorizer_buf_len)
ceph_con_out_kvec_add(con, auth->authorizer_buf_len,
con_out_kvec_add(con, auth->authorizer_buf_len,
auth->authorizer_buf);

con->out_more = 0;
Expand Down Expand Up @@ -935,7 +935,7 @@ static int write_partial_msg_pages(struct ceph_connection *con)
/* prepare and queue up footer, too */
if (!do_datacrc)
con->out_msg->footer.flags |= CEPH_MSG_FOOTER_NOCRC;
ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
prepare_write_message_footer(con);
ret = 1;
out:
Expand Down Expand Up @@ -1398,7 +1398,7 @@ static int process_connect(struct ceph_connection *con)
return -1;
}
con->auth_retry = 1;
ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
Expand All @@ -1419,7 +1419,7 @@ static int process_connect(struct ceph_connection *con)
ENTITY_NAME(con->peer_name),
ceph_pr_addr(&con->peer_addr.in_addr));
reset_connection(con);
ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
Expand All @@ -1445,7 +1445,7 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->out_connect.connect_seq),
le32_to_cpu(con->in_connect.connect_seq));
con->connect_seq = le32_to_cpu(con->in_connect.connect_seq);
ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
Expand All @@ -1462,7 +1462,7 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->in_connect.global_seq));
get_global_seq(con->msgr,
le32_to_cpu(con->in_connect.global_seq));
ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
ret = prepare_write_connect(con);
if (ret < 0)
return ret;
Expand Down Expand Up @@ -1869,7 +1869,7 @@ static int try_write(struct ceph_connection *con)

/* open the socket first? */
if (con->sock == NULL) {
ceph_con_out_kvec_reset(con);
con_out_kvec_reset(con);
prepare_write_banner(con);
ret = prepare_write_connect(con);
if (ret < 0)
Expand Down

0 comments on commit e220042

Please sign in to comment.