iscsi-scst, srpt: Fix the build against MOFED 5

Reported-by: Grant Albitz <Cryptz@Cryptz.com> git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8866 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2026-05-14 09:11:27 +00:00 · 2020-05-06 03:26:38 +00:00
parent 102797b00b
commit 3f97a8d3cb
45 changed files with 45 additions and 45 deletions
--- a/iscsi-scst/conftest/bad_wr_mod/bad_wr_mod.c
+++ b/iscsi-scst/conftest/bad_wr_mod/bad_wr_mod.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_cm.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_qp qp = { };
 	const struct ib_recv_wr recv_wr = { };
--- a/iscsi-scst/conftest/cm_event_mod/cm_event_mod.c
+++ b/iscsi-scst/conftest/cm_event_mod/cm_event_mod.c
@@ -6,7 +6,7 @@ static int h(struct ib_cm_id *cm_id, const struct ib_cm_event *event)
 	return 0;
 }

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_create_cm_id(NULL, h, NULL) != NULL;
 }
--- a/iscsi-scst/conftest/cm_listen/cm_listen.c
+++ b/iscsi-scst/conftest/cm_listen/cm_listen.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_cm.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_cm_listen(NULL, 0, 0, NULL);
 }
--- a/iscsi-scst/conftest/create_cq/create_cq.c
+++ b/iscsi-scst/conftest/create_cq/create_cq.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_cq *q;

--- a/iscsi-scst/conftest/create_send_mad_ah/create_send_mad_ah.c
+++ b/iscsi-scst/conftest/create_send_mad_ah/create_send_mad_ah.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_mad_send_buf *b;

--- a/iscsi-scst/conftest/create_send_mad_base/create_send_mad_base.c
+++ b/iscsi-scst/conftest/create_send_mad_base/create_send_mad_base.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_mad_send_buf *b;

--- a/iscsi-scst/conftest/dev_attr_max_recv_sge/dev_attr_max_recv_sge.c
+++ b/iscsi-scst/conftest/dev_attr_max_recv_sge/dev_attr_max_recv_sge.c
@@ -2,7 +2,7 @@
 #include <linux/stddef.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return offsetof(struct ib_device_attr, max_recv_sge);
 }
--- a/iscsi-scst/conftest/gid_change/gid_change.c
+++ b/iscsi-scst/conftest/gid_change/gid_change.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return IB_EVENT_GID_CHANGE;
 }
--- a/iscsi-scst/conftest/ib_client_remove/ib_client_remove.c
+++ b/iscsi-scst/conftest/ib_client_remove/ib_client_remove.c
@@ -5,7 +5,7 @@ static void remove_one(struct ib_device *device, void *client_data)
 {
 }

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_client c = { .remove = remove_one };

--- a/iscsi-scst/conftest/ib_dma_map_ops/ib_dma_map_ops.c
+++ b/iscsi-scst/conftest/ib_dma_map_ops/ib_dma_map_ops.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_dma_mapping_error(NULL, 0) != 0;
 }
--- a/iscsi-scst/conftest/ib_set_cpi_resp_time/ib_set_cpi_resp_time.c
+++ b/iscsi-scst/conftest/ib_set_cpi_resp_time/ib_set_cpi_resp_time.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return (uintptr_t)ib_set_cpi_resp_time;
 }
--- a/iscsi-scst/conftest/mad_handler_takes_send_buf/mad_handler_takes_send_buf.c
+++ b/iscsi-scst/conftest/mad_handler_takes_send_buf/mad_handler_takes_send_buf.c
@@ -7,7 +7,7 @@ static void imrh(struct ib_mad_agent *mad_agent,
 {
 }

-static int modinit(void)
+static int __init modinit(void)
 {
 	ib_mad_recv_handler h = imrh;

--- a/iscsi-scst/conftest/pd_has_local_dma_lkey/pd_has_local_dma_lkey.c
+++ b/iscsi-scst/conftest/pd_has_local_dma_lkey/pd_has_local_dma_lkey.c
@@ -2,7 +2,7 @@
 #include <linux/stddef.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return offsetof(struct ib_pd, local_dma_lkey);
 }
--- a/iscsi-scst/conftest/query_device/query_device.c
+++ b/iscsi-scst/conftest/query_device/query_device.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return (uintptr_t)ib_query_device;
 }
--- a/iscsi-scst/conftest/query_device_attr_arg/query_device_attr_arg.c
+++ b/iscsi-scst/conftest/query_device_attr_arg/query_device_attr_arg.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_query_device(NULL, NULL);
 }
--- a/iscsi-scst/conftest/query_gid/query_gid.c
+++ b/iscsi-scst/conftest/query_gid/query_gid.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_query_gid(NULL, 0, 0, NULL, NULL);
 }
--- a/iscsi-scst/conftest/rdma_create_id_net/rdma_create_id_net.c
+++ b/iscsi-scst/conftest/rdma_create_id_net/rdma_create_id_net.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/rdma_cm.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return rdma_create_id(NULL, NULL, NULL, 0, 0) != NULL;

--- a/iscsi-scst/conftest/register_mad_agent/register_mad_agent.c
+++ b/iscsi-scst/conftest/register_mad_agent/register_mad_agent.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_mad_agent *a;

--- a/iscsi-scst/conftest/sock_recvmsg/sock_recvmsg.c
+++ b/iscsi-scst/conftest/sock_recvmsg/sock_recvmsg.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <linux/net.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	int (*f)(struct socket *, struct msghdr *, size_t, int) = sock_recvmsg;

--- a/iscsi-scst/conftest/use_pre_440_wr_structure/use_pre_440_wr_structure.c
+++ b/iscsi-scst/conftest/use_pre_440_wr_structure/use_pre_440_wr_structure.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_send_wr wr = { };

--- a/srpt/conftest/bad_wr_mod/bad_wr_mod.c
+++ b/srpt/conftest/bad_wr_mod/bad_wr_mod.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_cm.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_qp qp = { };
 	const struct ib_recv_wr recv_wr = { };
--- a/srpt/conftest/cm_event_mod/cm_event_mod.c
+++ b/srpt/conftest/cm_event_mod/cm_event_mod.c
@@ -6,7 +6,7 @@ static int h(struct ib_cm_id *cm_id, const struct ib_cm_event *event)
 	return 0;
 }

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_create_cm_id(NULL, h, NULL) != NULL;
 }
--- a/srpt/conftest/cm_listen/cm_listen.c
+++ b/srpt/conftest/cm_listen/cm_listen.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_cm.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_cm_listen(NULL, 0, 0, NULL);
 }
--- a/srpt/conftest/create_cq/create_cq.c
+++ b/srpt/conftest/create_cq/create_cq.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_cq *q;

--- a/srpt/conftest/create_send_mad_ah/create_send_mad_ah.c
+++ b/srpt/conftest/create_send_mad_ah/create_send_mad_ah.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_mad_send_buf *b;

--- a/srpt/conftest/create_send_mad_base/create_send_mad_base.c
+++ b/srpt/conftest/create_send_mad_base/create_send_mad_base.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_mad_send_buf *b;

--- a/srpt/conftest/dev_attr_max_send_sge/dev_attr_max_send_sge.c
+++ b/srpt/conftest/dev_attr_max_send_sge/dev_attr_max_send_sge.c
@@ -2,7 +2,7 @@
 #include <linux/stddef.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return offsetof(struct ib_device_attr, max_send_sge);
 }
--- a/srpt/conftest/gid_change/gid_change.c
+++ b/srpt/conftest/gid_change/gid_change.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return IB_EVENT_GID_CHANGE;
 }
--- a/srpt/conftest/ib_client_remove/ib_client_remove.c
+++ b/srpt/conftest/ib_client_remove/ib_client_remove.c
@@ -5,7 +5,7 @@ static void remove_one(struct ib_device *device, void *client_data)
 {
 }

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_client c = { .remove = remove_one };

--- a/srpt/conftest/ib_dma_map_ops/ib_dma_map_ops.c
+++ b/srpt/conftest/ib_dma_map_ops/ib_dma_map_ops.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_dma_mapping_error(NULL, 0) != 0;
 }
--- a/srpt/conftest/ib_set_cpi_resp_time/ib_set_cpi_resp_time.c
+++ b/srpt/conftest/ib_set_cpi_resp_time/ib_set_cpi_resp_time.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return (uintptr_t)ib_set_cpi_resp_time;
 }
--- a/srpt/conftest/ib_sg_dma_len/ib_sg_dma_len.c
+++ b/srpt/conftest/ib_sg_dma_len/ib_sg_dma_len.c
@@ -3,7 +3,7 @@

 #undef ib_sg_dma_len

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_sg_dma_len != NULL;
 }
--- a/srpt/conftest/mad_handler_takes_send_buf/mad_handler_takes_send_buf.c
+++ b/srpt/conftest/mad_handler_takes_send_buf/mad_handler_takes_send_buf.c
@@ -7,7 +7,7 @@ static void imrh(struct ib_mad_agent *mad_agent,
 {
 }

-static int modinit(void)
+static int __init modinit(void)
 {
 	ib_mad_recv_handler h = imrh;

--- a/srpt/conftest/pd_has_local_dma_lkey/pd_has_local_dma_lkey.c
+++ b/srpt/conftest/pd_has_local_dma_lkey/pd_has_local_dma_lkey.c
@@ -2,7 +2,7 @@
 #include <linux/stddef.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return offsetof(struct ib_pd, local_dma_lkey);
 }
--- a/srpt/conftest/query_device/query_device.c
+++ b/srpt/conftest/query_device/query_device.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return (uintptr_t)ib_query_device;
 }
--- a/srpt/conftest/query_device_attr_arg/query_device_attr_arg.c
+++ b/srpt/conftest/query_device_attr_arg/query_device_attr_arg.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_query_device(NULL, NULL);
 }
--- a/srpt/conftest/query_gid/query_gid.c
+++ b/srpt/conftest/query_gid/query_gid.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return ib_query_gid(NULL, 0, 0, NULL, NULL);
 }
--- a/srpt/conftest/rdma_create_id_net/rdma_create_id_net.c
+++ b/srpt/conftest/rdma_create_id_net/rdma_create_id_net.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/rdma_cm.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return rdma_create_id(NULL, NULL, NULL, 0, 0) != NULL;

--- a/srpt/conftest/rdma_destroy_ah/rdma_destroy_ah.c
+++ b/srpt/conftest/rdma_destroy_ah/rdma_destroy_ah.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return rdma_destroy_ah(NULL) != 0;

--- a/srpt/conftest/rdma_destroy_ah_with_flags/rdma_destroy_ah_with_flags.c
+++ b/srpt/conftest/rdma_destroy_ah_with_flags/rdma_destroy_ah_with_flags.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return rdma_destroy_ah(NULL, 0) != 0;

--- a/srpt/conftest/rdma_query_gid/rdma_query_gid.c
+++ b/srpt/conftest/rdma_query_gid/rdma_query_gid.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_cache.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return rdma_query_gid(NULL, 0, 0, NULL);
 }
--- a/srpt/conftest/register_mad_agent/register_mad_agent.c
+++ b/srpt/conftest/register_mad_agent/register_mad_agent.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_mad.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_mad_agent *a;

--- a/srpt/conftest/srp_data_desc_imm/srp_data_desc_imm.c
+++ b/srpt/conftest/srp_data_desc_imm/srp_data_desc_imm.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <scsi/srp.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return SRP_DATA_DESC_IMM;
 }
--- a/srpt/conftest/srp_login_req_rdma/srp_login_req_rdma.c
+++ b/srpt/conftest/srp_login_req_rdma/srp_login_req_rdma.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <scsi/srp.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	return sizeof(struct srp_login_req_rdma);
 }
--- a/srpt/conftest/use_pre_440_wr_structure/use_pre_440_wr_structure.c
+++ b/srpt/conftest/use_pre_440_wr_structure/use_pre_440_wr_structure.c
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <rdma/ib_verbs.h>

-static int modinit(void)
+static int __init modinit(void)
 {
 	struct ib_send_wr wr = { };