mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
ceph: messenger: send banner in process_connect()
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:
parent
84fb3adf64
commit
41b90c0085
1 changed files with 7 additions and 9 deletions
|
@ -695,8 +695,7 @@ static void prepare_write_banner(struct ceph_messenger *msgr,
|
|||
}
|
||||
|
||||
static int prepare_write_connect(struct ceph_messenger *msgr,
|
||||
struct ceph_connection *con,
|
||||
int include_banner)
|
||||
struct ceph_connection *con)
|
||||
{
|
||||
unsigned global_seq = get_global_seq(con->msgr, 0);
|
||||
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.flags = 0;
|
||||
|
||||
if (include_banner)
|
||||
prepare_write_banner(msgr, con);
|
||||
ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect);
|
||||
|
||||
con->out_more = 0;
|
||||
|
@ -1389,7 +1386,7 @@ static int process_connect(struct ceph_connection *con)
|
|||
}
|
||||
con->auth_retry = 1;
|
||||
ceph_con_out_kvec_reset(con);
|
||||
ret = prepare_write_connect(con->msgr, con, 0);
|
||||
ret = prepare_write_connect(con->msgr, con);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
prepare_read_connect(con);
|
||||
|
@ -1410,7 +1407,7 @@ static int process_connect(struct ceph_connection *con)
|
|||
ceph_pr_addr(&con->peer_addr.in_addr));
|
||||
reset_connection(con);
|
||||
ceph_con_out_kvec_reset(con);
|
||||
prepare_write_connect(con->msgr, con, 0);
|
||||
prepare_write_connect(con->msgr, con);
|
||||
prepare_read_connect(con);
|
||||
|
||||
/* Tell ceph about it. */
|
||||
|
@ -1434,7 +1431,7 @@ static int process_connect(struct ceph_connection *con)
|
|||
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);
|
||||
prepare_write_connect(con->msgr, con, 0);
|
||||
prepare_write_connect(con->msgr, con);
|
||||
prepare_read_connect(con);
|
||||
break;
|
||||
|
||||
|
@ -1449,7 +1446,7 @@ static int process_connect(struct ceph_connection *con)
|
|||
get_global_seq(con->msgr,
|
||||
le32_to_cpu(con->in_connect.global_seq));
|
||||
ceph_con_out_kvec_reset(con);
|
||||
prepare_write_connect(con->msgr, con, 0);
|
||||
prepare_write_connect(con->msgr, con);
|
||||
prepare_read_connect(con);
|
||||
break;
|
||||
|
||||
|
@ -1855,7 +1852,8 @@ static int try_write(struct ceph_connection *con)
|
|||
/* open the socket first? */
|
||||
if (con->sock == NULL) {
|
||||
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);
|
||||
set_bit(CONNECTING, &con->state);
|
||||
clear_bit(NEGOTIATING, &con->state);
|
||||
|
|
Loading…
Reference in a new issue