[rds-devel] [PATCH 19/19] Make IB/iWARP transport->stats_info_copy()/exit() can be compiled without warning

[Jie Liu]

Since we have changed transport->stats_info_copy()/exit() signature to make TCP works, so here
we have to make IB/IW relatged stuff aware of this change, and make them can be compiled but not
really make sense for now.

Signed-off-by: Jie Liu <jeff.liu at oracle.com>
---
 net/rds/ib.c             |    2 +-
 net/rds/ib.h             |    3 ++-
 net/rds/ib_stats.c       |    3 ++-
 net/rds/iw.c             |    2 +-
 net/rds/iw.h             |    3 ++-
 net/rds/iw_stats.c       |    3 ++-
 net/rds/rdma_transport.c |    6 +++---
 net/rds/rdma_transport.h |    4 ++--
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/net/rds/ib.c b/net/rds/ib.c
index d0e5651..b47edba 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -357,7 +357,7 @@ static void rds_ib_unregister_client(void)
 	flush_workqueue(rds_wq);
 }
 
-void rds_ib_exit(void)
+void rds_ib_exit(struct net *net)
 {
 	rds_info_deregister_func(RDS_INFO_IB_CONNECTIONS, rds_ib_ic_info);
 	rds_ib_unregister_client();
diff --git a/net/rds/ib.h b/net/rds/ib.h
index 3c8dd95..b7a13b7 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -357,7 +357,8 @@ int rds_ib_xmit_atomic(struct rds_connection *conn, struct rm_atomic_op *op);
 /* ib_stats.c */
 DECLARE_PER_CPU(struct rds_ib_statistics, rds_ib_stats);
 #define rds_ib_stats_inc(member) rds_stats_inc_which(rds_ib_stats, member)
-unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter,
+unsigned int rds_ib_stats_info_copy(struct net *net,
+				    struct rds_info_iterator *iter,
 				    unsigned int avail);
 
 /* ib_sysctl.c */
diff --git a/net/rds/ib_stats.c b/net/rds/ib_stats.c
index 2d5965d..c0af86e 100644
--- a/net/rds/ib_stats.c
+++ b/net/rds/ib_stats.c
@@ -71,7 +71,8 @@ static const char *const rds_ib_stat_names[] = {
 	"ib_atomic_fadd",
 };
 
-unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter,
+unsigned int rds_ib_stats_info_copy(struct net *net,
+				    struct rds_info_iterator *iter,
 				    unsigned int avail)
 {
 	struct rds_ib_statistics stats = {0, };
diff --git a/net/rds/iw.c b/net/rds/iw.c
index 00f810b..2982d53 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -251,7 +251,7 @@ static int rds_iw_laddr_check(struct net *net, __be32 addr)
 	return ret;
 }
 
-void rds_iw_exit(void)
+void rds_iw_exit(struct net *net)
 {
 	rds_info_deregister_func(RDS_INFO_IWARP_CONNECTIONS, rds_iw_ic_info);
 	rds_iw_destroy_nodev_conns();
diff --git a/net/rds/iw.h b/net/rds/iw.h
index b963d2a..52b413c 100644
--- a/net/rds/iw.h
+++ b/net/rds/iw.h
@@ -364,7 +364,8 @@ int rds_iw_send_grab_credits(struct rds_iw_connection *ic, u32 wanted,
 /* ib_stats.c */
 DECLARE_PER_CPU(struct rds_iw_statistics, rds_iw_stats);
 #define rds_iw_stats_inc(member) rds_stats_inc_which(rds_iw_stats, member)
-unsigned int rds_iw_stats_info_copy(struct rds_info_iterator *iter,
+unsigned int rds_iw_stats_info_copy(struct net *net,
+				    struct rds_info_iterator *iter,
 				    unsigned int avail);
 
 /* ib_sysctl.c */
diff --git a/net/rds/iw_stats.c b/net/rds/iw_stats.c
index 5fe67f6..f74650a 100644
--- a/net/rds/iw_stats.c
+++ b/net/rds/iw_stats.c
@@ -69,7 +69,8 @@ static const char *const rds_iw_stat_names[] = {
 	"iw_rdma_mr_pool_depleted",
 };
 
-unsigned int rds_iw_stats_info_copy(struct rds_info_iterator *iter,
+unsigned int rds_iw_stats_info_copy(struct net *net,
+				    struct rds_info_iterator *iter,
 				    unsigned int avail)
 {
 	struct rds_iw_statistics stats = {0, };
diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index c2be901..263782c 100644
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -228,7 +228,7 @@ static int rds_rdma_init(void)
 	goto out;
 
 err_ib_init:
-	rds_iw_exit();
+	rds_iw_exit(NULL);
 err_iw_init:
 	rds_rdma_listen_stop();
 out:
@@ -240,8 +240,8 @@ static void rds_rdma_exit(void)
 {
 	/* stop listening first to ensure no new connections are attempted */
 	rds_rdma_listen_stop();
-	rds_ib_exit();
-	rds_iw_exit();
+	rds_ib_exit(NULL);
+	rds_iw_exit(NULL);
 }
 module_exit(rds_rdma_exit);
 
diff --git a/net/rds/rdma_transport.h b/net/rds/rdma_transport.h
index faba4e3..e8f9067 100644
--- a/net/rds/rdma_transport.h
+++ b/net/rds/rdma_transport.h
@@ -14,11 +14,11 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
 /* from ib.c */
 extern struct rds_transport rds_ib_transport;
 int rds_ib_init(void);
-void rds_ib_exit(void);
+void rds_ib_exit(struct net *net);
 
 /* from iw.c */
 extern struct rds_transport rds_iw_transport;
 int rds_iw_init(void);
-void rds_iw_exit(void);
+void rds_iw_exit(struct net *net);
 
 #endif
-- 
1.7.4.1