libceph: don't reset kvec in prepare_write_banner()

(cherry picked from commit d329156f16306449c273002486c28de3ddddfd89)

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index a659b4de64aaacba7dd851ffc7de44d2c2e2a82b..bcbd409b5ca75e42fa15cbaefe66f399c6c52560 100644 (file)
--- 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;