summaryrefslogtreecommitdiffstats
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-05-16 15:16:38 -0500
committerAlex Elder <elder@dreamhost.com>2012-05-17 08:18:12 -0500
commitd329156f16306449c273002486c28de3ddddfd89 (patch)
treeceba5b2bb6d7ba09194f519628cd0031bdad9e63 /net/ceph/messenger.c
parentc047be09349752b8a4dac27bc9f130bf4d592f11 (diff)
downloadlinux-d329156f16306449c273002486c28de3ddddfd89.tar.gz
linux-d329156f16306449c273002486c28de3ddddfd89.tar.bz2
linux-d329156f16306449c273002486c28de3ddddfd89.zip
libceph: don't reset kvec in prepare_write_banner()
Move the kvec reset for a connection out of prepare_write_banner and into its only caller. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph/messenger.c')
-rw-r--r--net/ceph/messenger.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index a659b4de64aa..bcbd409b5ca7 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -686,7 +686,6 @@ static int prepare_connect_authorizer(struct ceph_connection *con)
static void prepare_write_banner(struct ceph_messenger *msgr,
struct ceph_connection *con)
{
- ceph_con_out_kvec_reset(con);
ceph_con_out_kvec_add(con, strlen(CEPH_BANNER), CEPH_BANNER);
ceph_con_out_kvec_add(con, sizeof (msgr->my_enc_addr),
&msgr->my_enc_addr);
@@ -726,10 +725,9 @@ static int prepare_write_connect(struct ceph_messenger *msgr,
con->out_connect.protocol_version = cpu_to_le32(proto);
con->out_connect.flags = 0;
+ ceph_con_out_kvec_reset(con);
if (include_banner)
prepare_write_banner(msgr, con);
- else
- ceph_con_out_kvec_reset(con);
ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect);
con->out_more = 0;