Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c6808d authored by Zach Brown's avatar Zach Brown Committed by Andy Grover
Browse files

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: default avatarZach Brown <zach.brown@oracle.com>
parent 3e0249f9

net/rds/connection.c

+12 −0
Original line number Diff line number Diff line
@@ -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

 */

net/rds/rds.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

net/rds/send.c

+2 −14
Original line number Diff line number Diff line
@@ -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)