niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

RDS: Move loop-only function to loop.c

Browse source 
Also, try to better-document the locking around the
rm and its m_inc in loop.c.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
This commit is contained in:
Andy Grover 2010-01-19 18:14:56 -08:00
parent c8de3f1005
commit d37c935905
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/rds/loop.c
View file

@ -64,7 +64,8 @@ static int rds_loop_xmit(struct rds_connection *conn, struct rds_message *rm,
BUG_ON(hdr_off || sg || off); BUG_ON(hdr_off || sg || off);
rds_inc_init(&rm->m_inc, conn, conn->c_laddr); rds_inc_init(&rm->m_inc, conn, conn->c_laddr);
rds_message_addref(rm); /* for the inc */ /* For the embedded inc. Matching put is in loop_inc_free() */
rds_message_addref(rm);
rds_recv_incoming(conn, conn->c_laddr, conn->c_faddr, &rm->m_inc, rds_recv_incoming(conn, conn->c_laddr, conn->c_faddr, &rm->m_inc,
GFP_KERNEL, KM_USER0); GFP_KERNEL, KM_USER0);
@ -77,6 +78,16 @@ static int rds_loop_xmit(struct rds_connection *conn, struct rds_message *rm,
return sizeof(struct rds_header) + be32_to_cpu(rm->m_inc.i_hdr.h_len); return sizeof(struct rds_header) + be32_to_cpu(rm->m_inc.i_hdr.h_len);
} }
/*
* See rds_loop_xmit(). Since our inc is embedded in the rm, we
* make sure the rm lives at least until the inc is done.
*/
static void rds_loop_inc_free(struct rds_incoming *inc)
{
struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
rds_message_put(rm);
}
static int rds_loop_xmit_cong_map(struct rds_connection *conn, static int rds_loop_xmit_cong_map(struct rds_connection *conn,
struct rds_cong_map *map, struct rds_cong_map *map,
unsigned long offset) unsigned long offset)
@ -176,6 +187,6 @@ struct rds_transport rds_loop_transport = {
.conn_connect = rds_loop_conn_connect, .conn_connect = rds_loop_conn_connect,
.conn_shutdown = rds_loop_conn_shutdown, .conn_shutdown = rds_loop_conn_shutdown,
.inc_copy_to_user = rds_message_inc_copy_to_user, .inc_copy_to_user = rds_message_inc_copy_to_user,
.inc_free = rds_message_inc_free, .inc_free = rds_loop_inc_free,
.t_name = "loopback", .t_name = "loopback",
}; };

6
net/rds/message.c
View file

@ -89,12 +89,6 @@ void rds_message_put(struct rds_message *rm)
} }
EXPORT_SYMBOL_GPL(rds_message_put); EXPORT_SYMBOL_GPL(rds_message_put);
void rds_message_inc_free(struct rds_incoming *inc)
{
struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
rds_message_put(rm);
}
void rds_message_populate_header(struct rds_header *hdr, __be16 sport, void rds_message_populate_header(struct rds_header *hdr, __be16 sport,
__be16 dport, u64 seq) __be16 dport, u64 seq)
{ {