[rds-devel] [PATCH 2/3] [rds] introduce rds_conn_connect_if_down()

[Zach Brown]

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 into a helper function.

Signed-off-by: Zach Brown <zach.brown at oracle.com>
---
 net/rds/connection.c |   12 ++++++++++++
 net/rds/rds.h        |    1 +
 net/rds/send.c       |   16 ++--------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 278f607..a2f8911 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -485,6 +485,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/net/rds/rds.h b/net/rds/rds.h
index 85d6f89..2d2a1b4 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -528,6 +528,7 @@ struct rds_connection *rds_conn_create_outgoing(__be32 laddr, __be32 faddr,
 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 b2fccfc..07eec82 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -885,13 +885,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)
@@ -968,13 +962,7 @@ rds_send_pong(struct rds_connection *conn, __be16 dport)
 
 	rm->m_daddr = conn->c_faddr;
 
-	/* 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)
-- 
1.6.2.5