From 087d08c70cec2af56c5e5c5308e1731cc961c79a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 24 May 2010 13:14:36 -0700 Subject: [PATCH] --- yaml --- r: 214437 b: refs/heads/master c: f3c6808d3d8513db2b0543538fc35c25a60fe7a7 h: refs/heads/master i: 214435: 69651d0113b9e7f7cbae62bbd772ea220bac96a6 v: v3 --- [refs] | 2 +- trunk/net/rds/connection.c | 12 ++++++++++++ trunk/net/rds/rds.h | 1 + trunk/net/rds/send.c | 16 ++-------------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index ea2d7c30ec46..eea938e694b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e0249f9c05cb77b66f7f09644ca9ca208d991a9 +refs/heads/master: f3c6808d3d8513db2b0543538fc35c25a60fe7a7 diff --git a/trunk/net/rds/connection.c b/trunk/net/rds/connection.c index 180b83ab2607..5bd96d538fb9 100644 --- a/trunk/net/rds/connection.c +++ b/trunk/net/rds/connection.c @@ -539,6 +539,18 @@ void rds_conn_drop(struct rds_connection *conn) } EXPORT_SYMBOL_GPL(rds_conn_drop); +/* + * If the connection is down, trigger a connect. We may have scheduled a + * delayed reconnect however - in this case we should not interfere. + */ +void rds_conn_connect_if_down(struct rds_connection *conn) +{ + if (rds_conn_state(conn) == RDS_CONN_DOWN && + !test_and_set_bit(RDS_RECONNECT_PENDING, &conn->c_flags)) + queue_delayed_work(rds_wq, &conn->c_conn_w, 0); +} +EXPORT_SYMBOL_GPL(rds_conn_connect_if_down); + /* * An error occurred on the connection */ diff --git a/trunk/net/rds/rds.h b/trunk/net/rds/rds.h index 4ab3d1aa0237..cba5f8bb4780 100644 --- a/trunk/net/rds/rds.h +++ b/trunk/net/rds/rds.h @@ -617,6 +617,7 @@ void rds_conn_shutdown(struct rds_connection *conn); void rds_conn_destroy(struct rds_connection *conn); void rds_conn_reset(struct rds_connection *conn); void rds_conn_drop(struct rds_connection *conn); +void rds_conn_connect_if_down(struct rds_connection *conn); void rds_for_each_conn_info(struct socket *sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens, diff --git a/trunk/net/rds/send.c b/trunk/net/rds/send.c index 437f1e72609c..a6295993e3e1 100644 --- a/trunk/net/rds/send.c +++ b/trunk/net/rds/send.c @@ -1036,13 +1036,7 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, goto out; } - /* If the connection is down, trigger a connect. We may - * have scheduled a delayed reconnect however - in this case - * we should not interfere. - */ - if (rds_conn_state(conn) == RDS_CONN_DOWN && - !test_and_set_bit(RDS_RECONNECT_PENDING, &conn->c_flags)) - queue_delayed_work(rds_wq, &conn->c_conn_w, 0); + rds_conn_connect_if_down(conn); ret = rds_cong_wait(conn->c_fcong, dport, nonblock, rs); if (ret) { @@ -1122,13 +1116,7 @@ rds_send_pong(struct rds_connection *conn, __be16 dport) rm->m_daddr = conn->c_faddr; rm->data.op_active = 1; - /* If the connection is down, trigger a connect. We may - * have scheduled a delayed reconnect however - in this case - * we should not interfere. - */ - if (rds_conn_state(conn) == RDS_CONN_DOWN && - !test_and_set_bit(RDS_RECONNECT_PENDING, &conn->c_flags)) - queue_delayed_work(rds_wq, &conn->c_conn_w, 0); + rds_conn_connect_if_down(conn); ret = rds_cong_wait(conn->c_fcong, dport, 1, NULL); if (ret)