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

Commit b04e8554 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

RDS: TCP: Hooks to set up a single connection path 



This patch adds ->conn_path_connect callbacks in the rds_transport
that are used to set up a single connection path.

Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2da43c4a

net/rds/ib.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ struct rds_transport rds_ib_transport = { 
	.recv_path		= rds_ib_recv_path,

	.conn_alloc		= rds_ib_conn_alloc,

	.conn_free		= rds_ib_conn_free,

	.conn_connect		= rds_ib_conn_connect,

	.conn_path_connect	= rds_ib_conn_path_connect,

	.conn_path_shutdown	= rds_ib_conn_path_shutdown,

	.inc_copy_to_user	= rds_ib_inc_copy_to_user,

	.inc_free		= rds_ib_inc_free,

net/rds/ib.h

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ extern struct list_head ib_nodev_conns; 
/* ib_cm.c */

int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp);

void rds_ib_conn_free(void *arg);

int rds_ib_conn_connect(struct rds_connection *conn);

int rds_ib_conn_path_connect(struct rds_conn_path *cp);

void rds_ib_conn_path_shutdown(struct rds_conn_path *cp);

void rds_ib_state_change(struct sock *sk);

int rds_ib_listen_init(void);

net/rds/ib_cm.c

+2 −1
Original line number Diff line number Diff line
@@ -685,8 +685,9 @@ int rds_ib_cm_initiate_connect(struct rdma_cm_id *cm_id) 
	return ret;

}



int rds_ib_conn_connect(struct rds_connection *conn)

int rds_ib_conn_path_connect(struct rds_conn_path *cp)

{

	struct rds_connection *conn = cp->cp_conn;

	struct rds_ib_connection *ic = conn->c_transport_data;

	struct sockaddr_in src, dest;

	int ret;

net/rds/loop.c

+3 −3
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ static void rds_loop_conn_free(void *arg) 
	kfree(lc);

}



static int rds_loop_conn_connect(struct rds_connection *conn)

static int rds_loop_conn_path_connect(struct rds_conn_path *cp)

{

	rds_connect_complete(conn);

	rds_connect_complete(cp->cp_conn);

	return 0;

}
@@ -188,7 +188,7 @@ struct rds_transport rds_loop_transport = { 
	.recv_path		= rds_loop_recv_path,

	.conn_alloc		= rds_loop_conn_alloc,

	.conn_free		= rds_loop_conn_free,

	.conn_connect		= rds_loop_conn_connect,

	.conn_path_connect	= rds_loop_conn_path_connect,

	.conn_path_shutdown	= rds_loop_conn_path_shutdown,

	.inc_copy_to_user	= rds_message_inc_copy_to_user,

	.inc_free		= rds_loop_inc_free,

net/rds/rds.h

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ struct rds_transport { 
	int (*laddr_check)(struct net *net, __be32 addr);

	int (*conn_alloc)(struct rds_connection *conn, gfp_t gfp);

	void (*conn_free)(void *data);

	int (*conn_connect)(struct rds_connection *conn);

	int (*conn_path_connect)(struct rds_conn_path *cp);

	void (*conn_path_shutdown)(struct rds_conn_path *conn);

	void (*xmit_path_prepare)(struct rds_conn_path *cp);

	void (*xmit_path_complete)(struct rds_conn_path *cp);