diff options
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/messenger.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3917847ad8e5..0665945b6468 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -676,7 +676,7 @@ static void prepare_write_banner(struct ceph_messenger *msgr, | |||
676 | 676 | ||
677 | static int prepare_write_connect(struct ceph_messenger *msgr, | 677 | static int prepare_write_connect(struct ceph_messenger *msgr, |
678 | struct ceph_connection *con, | 678 | struct ceph_connection *con, |
679 | int after_banner) | 679 | int include_banner) |
680 | { | 680 | { |
681 | unsigned global_seq = get_global_seq(con->msgr, 0); | 681 | unsigned global_seq = get_global_seq(con->msgr, 0); |
682 | int proto; | 682 | int proto; |
@@ -705,7 +705,9 @@ static int prepare_write_connect(struct ceph_messenger *msgr, | |||
705 | con->out_connect.protocol_version = cpu_to_le32(proto); | 705 | con->out_connect.protocol_version = cpu_to_le32(proto); |
706 | con->out_connect.flags = 0; | 706 | con->out_connect.flags = 0; |
707 | 707 | ||
708 | if (!after_banner) { | 708 | if (include_banner) |
709 | prepare_write_banner(msgr, con); | ||
710 | else { | ||
709 | con->out_kvec_left = 0; | 711 | con->out_kvec_left = 0; |
710 | con->out_kvec_bytes = 0; | 712 | con->out_kvec_bytes = 0; |
711 | } | 713 | } |
@@ -1846,7 +1848,6 @@ more: | |||
1846 | 1848 | ||
1847 | /* open the socket first? */ | 1849 | /* open the socket first? */ |
1848 | if (con->sock == NULL) { | 1850 | if (con->sock == NULL) { |
1849 | prepare_write_banner(msgr, con); | ||
1850 | prepare_write_connect(msgr, con, 1); | 1851 | prepare_write_connect(msgr, con, 1); |
1851 | prepare_read_banner(con); | 1852 | prepare_read_banner(con); |
1852 | set_bit(CONNECTING, &con->state); | 1853 | set_bit(CONNECTING, &con->state); |