This is a note to let you know that I've just added the patch titled
ceph: messenger: reset connection kvec caller
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
0011-ceph-messenger-reset-connection-kvec-caller.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 4650b720da42507c0654908b6e2d215359944fff Mon Sep 17 00:00:00 2001
From: Alex Elder <[email protected]>
Date: Wed, 16 May 2012 15:16:38 -0500
Subject: ceph: messenger: reset connection kvec caller
From: Alex Elder <[email protected]>
(cherry picked from commit 84fb3adf6413862cff51d8af3fce5f0b655586a2)
Reset a connection's kvec fields in the caller rather than in
prepare_write_connect(). This ends up repeating a few lines of
code but it's improving the separation between distinct operations
on the connection, which we can take advantage of later.
Signed-off-by: Alex Elder <[email protected]>
Reviewed-by: Sage Weil <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/ceph/messenger.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -725,7 +725,6 @@ static int prepare_write_connect(struct
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);
ceph_con_out_kvec_add(con, sizeof (con->out_connect),
&con->out_connect);
@@ -1389,6 +1388,7 @@ static int process_connect(struct ceph_c
return -1;
}
con->auth_retry = 1;
+ ceph_con_out_kvec_reset(con);
ret = prepare_write_connect(con->msgr, con, 0);
if (ret < 0)
return ret;
@@ -1409,6 +1409,7 @@ static int process_connect(struct ceph_c
ENTITY_NAME(con->peer_name),
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_read_connect(con);
@@ -1432,6 +1433,7 @@ static int process_connect(struct ceph_c
le32_to_cpu(con->out_connect.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);
prepare_write_connect(con->msgr, con, 0);
prepare_read_connect(con);
break;
@@ -1446,6 +1448,7 @@ static int process_connect(struct ceph_c
le32_to_cpu(con->in_connect.global_seq));
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_read_connect(con);
break;
@@ -1851,6 +1854,7 @@ more:
/* open the socket first? */
if (con->sock == NULL) {
+ ceph_con_out_kvec_reset(con);
prepare_write_connect(msgr, con, 1);
prepare_read_banner(con);
set_bit(CONNECTING, &con->state);
Patches currently in stable-queue which might be from [email protected] are
queue-3.4/0005-crush-fix-memory-leak-when-destroying-tree-buckets.patch
queue-3.4/0002-crush-adjust-local-retry-threshold.patch
queue-3.4/0018-ceph-define-ceph_auth_handshake-type.patch
queue-3.4/0011-ceph-messenger-reset-connection-kvec-caller.patch
queue-3.4/0019-ceph-messenger-reduce-args-to-create_authorizer.patch
queue-3.4/0015-ceph-messenger-check-prepare_write_connect-result.patch
queue-3.4/0003-crush-be-more-tolerant-of-nonsensical-crush-maps.patch
queue-3.4/0014-ceph-don-t-set-WRITE_PENDING-too-early.patch
queue-3.4/0016-ceph-messenger-rework-prepare_connect_authorizer.patch
queue-3.4/0013-ceph-drop-msgr-argument-from-prepare_write_connect.patch
queue-3.4/0009-ceph-messenger-change-read_partial-to-take-end-arg.patch
queue-3.4/0017-ceph-messenger-check-return-from-get_authorizer.patch
queue-3.4/0001-crush-clean-up-types-const-ness.patch
queue-3.4/0008-ceph-messenger-update-to-in-read_partial-caller.patch
queue-3.4/0007-ceph-messenger-use-read_partial-in-read_partial_mess.patch
queue-3.4/0010-libceph-don-t-reset-kvec-in-prepare_write_banner.patch
queue-3.4/0012-ceph-messenger-send-banner-in-process_connect.patch
queue-3.4/0004-crush-fix-tree-node-weight-lookup.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
