summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Brown <zach.brown@oracle.com>2010-05-24 13:14:36 -0700
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:15:18 -0700
commitf3c6808d3d8513db2b0543538fc35c25a60fe7a7 (patch)
tree84ef99e9d615351000c5cfa81cc08c8c8ffb4be6
parent3e0249f9c05cb77b66f7f09644ca9ca208d991a9 (diff)
downloadblackbird-op-linux-f3c6808d3d8513db2b0543538fc35c25a60fe7a7.tar.gz
blackbird-op-linux-f3c6808d3d8513db2b0543538fc35c25a60fe7a7.zip
RDS: introduce rds_conn_connect_if_down()
A few paths had the same block of code to queue a connection's connect work if it was in the right state. Let's move this in to a helper function. Signed-off-by: Zach Brown <zach.brown@oracle.com>
-rw-r--r--net/rds/connection.c12
-rw-r--r--net/rds/rds.h1
-rw-r--r--net/rds/send.c16
3 files changed, 15 insertions, 14 deletions
diff --git a/net/rds/connection.c b/net/rds/connection.c
index 180b83ab2607..5bd96d538fb9 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -540,6 +540,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
*/
void
diff --git a/net/rds/rds.h b/net/rds/rds.h
index 4ab3d1aa0237..cba5f8bb4780 100644
--- a/net/rds/rds.h
+++ b/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/net/rds/send.c b/net/rds/send.c
index 437f1e72609c..a6295993e3e1 100644
--- a/net/rds/send.c
+++ b/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)
OpenPOWER on IntegriCloud