Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ceph: messenger: send banner in process_connect()

Browse source 
prepare_write_connect() has an argument indicating whether a banner
should be sent out before sending out a connection message.  It's
only ever set in one of its callers, so move the code that arranges
to send the banner into that caller and drop the "include_banner"
argument from prepare_write_connect().

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Alex Elder 2012-05-16 15:16:38 -05:00 committed by Alex Elder
parent 84fb3adf64
commit 41b90c0085
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/ceph/messenger.c
View file

@ -695,8 +695,7 @@ static void prepare_write_banner(struct ceph_messenger *msgr,
} }
static int prepare_write_connect(struct ceph_messenger *msgr, static int prepare_write_connect(struct ceph_messenger *msgr,
struct ceph_connection *con, struct ceph_connection *con)
int include_banner)
{ {
unsigned global_seq = get_global_seq(con->msgr, 0); unsigned global_seq = get_global_seq(con->msgr, 0);
int proto; int proto;
@ -725,8 +724,6 @@ static int prepare_write_connect(struct ceph_messenger *msgr,
con->out_connect.protocol_version = cpu_to_le32(proto); con->out_connect.protocol_version = cpu_to_le32(proto);
con->out_connect.flags = 0; con->out_connect.flags = 0;
if (include_banner)
prepare_write_banner(msgr, con);
ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect); ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect);
con->out_more = 0; con->out_more = 0;
@ -1389,7 +1386,7 @@ static int process_connect(struct ceph_connection *con)
} }
con->auth_retry = 1; con->auth_retry = 1;
ceph_con_out_kvec_reset(con); ceph_con_out_kvec_reset(con);
ret = prepare_write_connect(con->msgr, con, 0); ret = prepare_write_connect(con->msgr, con);
if (ret < 0) if (ret < 0)
return ret; return ret;
prepare_read_connect(con); prepare_read_connect(con);
@ -1410,7 +1407,7 @@ static int process_connect(struct ceph_connection *con)
ceph_pr_addr(&con->peer_addr.in_addr)); ceph_pr_addr(&con->peer_addr.in_addr));
reset_connection(con); reset_connection(con);
ceph_con_out_kvec_reset(con); ceph_con_out_kvec_reset(con);
prepare_write_connect(con->msgr, con, 0); prepare_write_connect(con->msgr, con);
prepare_read_connect(con); prepare_read_connect(con);
/* Tell ceph about it. */ /* Tell ceph about it. */
@ -1434,7 +1431,7 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->in_connect.connect_seq)); le32_to_cpu(con->in_connect.connect_seq));
con->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); ceph_con_out_kvec_reset(con);
prepare_write_connect(con->msgr, con, 0); prepare_write_connect(con->msgr, con);
prepare_read_connect(con); prepare_read_connect(con);
break; break;
@ -1449,7 +1446,7 @@ static int process_connect(struct ceph_connection *con)
get_global_seq(con->msgr, get_global_seq(con->msgr,
le32_to_cpu(con->in_connect.global_seq)); le32_to_cpu(con->in_connect.global_seq));
ceph_con_out_kvec_reset(con); ceph_con_out_kvec_reset(con);
prepare_write_connect(con->msgr, con, 0); prepare_write_connect(con->msgr, con);
prepare_read_connect(con); prepare_read_connect(con);
break; break;
@ -1855,7 +1852,8 @@ static int try_write(struct ceph_connection *con)
/* open the socket first? */ /* open the socket first? */
if (con->sock == NULL) { if (con->sock == NULL) {
ceph_con_out_kvec_reset(con); ceph_con_out_kvec_reset(con);
prepare_write_connect(msgr, con, 1); prepare_write_banner(msgr, con);
prepare_write_connect(msgr, con);
prepare_read_banner(con); prepare_read_banner(con);
set_bit(CONNECTING, &con->state); set_bit(CONNECTING, &con->state);
clear_bit(NEGOTIATING, &con->state); clear_bit(NEGOTIATING, &con->state);