Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

RDS: inc_purge() transport function unused - remove it

Signed-off-by: Andy Grover <andy.grover@oracle.com>
Andy Grover 15 years ago
parent
6200ed7799
commit
809fa148a2
12 changed files with 3 additions and 18 deletions
Split View Show Diff Stats
  1. 0 1
      net/rds/ib.c
  2. 0 1
      net/rds/ib.h
  3. 1 1
      net/rds/ib_recv.c
  4. 0 1
      net/rds/iw.c
  5. 0 1
      net/rds/iw.h
  6. 1 1
      net/rds/iw_recv.c
  7. 0 1
      net/rds/loop.c
  8. 0 6
      net/rds/message.c
  9. 0 2
      net/rds/rds.h
  10. 0 1
      net/rds/tcp.c
  11. 0 1
      net/rds/tcp.h
  12. 1 1
      net/rds/tcp_recv.c

+ 0 - 1
net/rds/ib.c
View File 

@@ -274,7 +274,6 @@ struct rds_transport rds_ib_transport = {
 
 	.conn_connect		= rds_ib_conn_connect,
 
 	.conn_shutdown		= rds_ib_conn_shutdown,
 
 	.inc_copy_to_user	= rds_ib_inc_copy_to_user,
 
-	.inc_purge		= rds_ib_inc_purge,
 
 	.inc_free		= rds_ib_inc_free,
 
 	.cm_initiate_connect	= rds_ib_cm_initiate_connect,
 
 	.cm_handle_connect	= rds_ib_cm_handle_connect,

+ 0 - 1
net/rds/ib.h
View File 

@@ -301,7 +301,6 @@ void rds_ib_recv_exit(void);
 
 int rds_ib_recv(struct rds_connection *conn);
 
 int rds_ib_recv_refill(struct rds_connection *conn, gfp_t kptr_gfp,
 
 		       gfp_t page_gfp, int prefill);
 
-void rds_ib_inc_purge(struct rds_incoming *inc);
 
 void rds_ib_inc_free(struct rds_incoming *inc);
 
 int rds_ib_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov,
 
 			     size_t size);

+ 1 - 1
net/rds/ib_recv.c
View File 

@@ -273,7 +273,7 @@ int rds_ib_recv_refill(struct rds_connection *conn, gfp_t kptr_gfp,
 
 	return ret;
 
 }
 
 
-void rds_ib_inc_purge(struct rds_incoming *inc)
 
+static void rds_ib_inc_purge(struct rds_incoming *inc)
 
 {
 
 	struct rds_ib_incoming *ibinc;
 
 	struct rds_page_frag *frag;

+ 0 - 1
net/rds/iw.c
View File 

@@ -272,7 +272,6 @@ struct rds_transport rds_iw_transport = {
 
 	.conn_connect		= rds_iw_conn_connect,
 
 	.conn_shutdown		= rds_iw_conn_shutdown,
 
 	.inc_copy_to_user	= rds_iw_inc_copy_to_user,
 
-	.inc_purge		= rds_iw_inc_purge,
 
 	.inc_free		= rds_iw_inc_free,
 
 	.cm_initiate_connect	= rds_iw_cm_initiate_connect,
 
 	.cm_handle_connect	= rds_iw_cm_handle_connect,

+ 0 - 1
net/rds/iw.h
View File 

@@ -326,7 +326,6 @@ void rds_iw_recv_exit(void);
 
 int rds_iw_recv(struct rds_connection *conn);
 
 int rds_iw_recv_refill(struct rds_connection *conn, gfp_t kptr_gfp,
 
 		       gfp_t page_gfp, int prefill);
 
-void rds_iw_inc_purge(struct rds_incoming *inc);
 
 void rds_iw_inc_free(struct rds_incoming *inc);
 
 int rds_iw_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov,
 
 			     size_t size);

+ 1 - 1
net/rds/iw_recv.c
View File 

@@ -273,7 +273,7 @@ int rds_iw_recv_refill(struct rds_connection *conn, gfp_t kptr_gfp,
 
 	return ret;
 
 }
 
 
-void rds_iw_inc_purge(struct rds_incoming *inc)
 
+static void rds_iw_inc_purge(struct rds_incoming *inc)
 
 {
 
 	struct rds_iw_incoming *iwinc;
 
 	struct rds_page_frag *frag;

+ 0 - 1
net/rds/loop.c
View File 

@@ -176,7 +176,6 @@ struct rds_transport rds_loop_transport = {
 
 	.conn_connect		= rds_loop_conn_connect,
 
 	.conn_shutdown		= rds_loop_conn_shutdown,
 
 	.inc_copy_to_user	= rds_message_inc_copy_to_user,
 
-	.inc_purge		= rds_message_inc_purge,
 
 	.inc_free		= rds_message_inc_free,
 
 	.t_name			= "loopback",
 
 };

+ 0 - 6
net/rds/message.c
View File 

@@ -75,12 +75,6 @@ static void rds_message_purge(struct rds_message *rm)
 
 		rds_mr_put(rm->rdma.m_rdma_mr);
 
 }
 
 
-void rds_message_inc_purge(struct rds_incoming *inc)
 
-{
 
-	struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
 
-	rds_message_purge(rm);
 
-}
 
-
 
 void rds_message_put(struct rds_message *rm)
 
 {
 
 	rdsdebug("put rm %p ref %d\n", rm, atomic_read(&rm->m_refcount));

+ 0 - 2
net/rds/rds.h
View File 

@@ -422,7 +422,6 @@ struct rds_transport {
 
 	int (*recv)(struct rds_connection *conn);
 
 	int (*inc_copy_to_user)(struct rds_incoming *inc, struct iovec *iov,
 
 				size_t size);
 
-	void (*inc_purge)(struct rds_incoming *inc);
 
 	void (*inc_free)(struct rds_incoming *inc);
 
 
 	int (*cm_handle_connect)(struct rdma_cm_id *cm_id,
 
@@ -668,7 +667,6 @@ int rds_message_get_version_extension(struct rds_header *hdr, unsigned int *vers
 
 int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset);
 
 int rds_message_inc_copy_to_user(struct rds_incoming *inc,
 
 				 struct iovec *first_iov, size_t size);
 
-void rds_message_inc_purge(struct rds_incoming *inc);
 
 void rds_message_inc_free(struct rds_incoming *inc);
 
 void rds_message_addref(struct rds_message *rm);
 
 void rds_message_put(struct rds_message *rm);

+ 0 - 1
net/rds/tcp.c
View File 

@@ -266,7 +266,6 @@ struct rds_transport rds_tcp_transport = {
 
 	.conn_connect		= rds_tcp_conn_connect,
 
 	.conn_shutdown		= rds_tcp_conn_shutdown,
 
 	.inc_copy_to_user	= rds_tcp_inc_copy_to_user,
 
-	.inc_purge		= rds_tcp_inc_purge,
 
 	.inc_free		= rds_tcp_inc_free,
 
 	.stats_info_copy	= rds_tcp_stats_info_copy,
 
 	.exit			= rds_tcp_exit,

+ 0 - 1
net/rds/tcp.h
View File 

@@ -70,7 +70,6 @@ int __init rds_tcp_recv_init(void);
 
 void rds_tcp_recv_exit(void);
 
 void rds_tcp_data_ready(struct sock *sk, int bytes);
 
 int rds_tcp_recv(struct rds_connection *conn);
 
-void rds_tcp_inc_purge(struct rds_incoming *inc);
 
 void rds_tcp_inc_free(struct rds_incoming *inc);
 
 int rds_tcp_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov,
 
 			     size_t size);

+ 1 - 1
net/rds/tcp_recv.c
View File 

@@ -39,7 +39,7 @@
 
 
 static struct kmem_cache *rds_tcp_incoming_slab;
 
 
-void rds_tcp_inc_purge(struct rds_incoming *inc)
 
+static void rds_tcp_inc_purge(struct rds_incoming *inc)
 
 {
 
 	struct rds_tcp_incoming *tinc;
 
 	tinc = container_of(inc, struct rds_tcp_incoming, ti_inc);