LU-10391 lnet: convert LNetGetID to return an large-addr pid

[fs/lustre-release.git] / lnet / selftest / module.c

diff --git a/lnet/selftest/module.c b/lnet/selftest/module.c
index 5324957..f7b83af 100644 (file)
--- a/lnet/selftest/module.c
+++ b/lnet/selftest/module.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
@@ -71,9 +70,8 @@ lnet_selftest_exit(void)
                                continue;
                        cfs_wi_sched_destroy(lst_sched_test[i]);
                }
-               LIBCFS_FREE(lst_sched_test,
-                           sizeof(lst_sched_test[0]) *
-                           cfs_cpt_number(lnet_cpt_table()));
+               CFS_FREE_PTR_ARRAY(lst_sched_test,
+                                  cfs_cpt_number(lnet_cpt_table()));
                lst_sched_test = NULL;
                /* fallthrough */
        case LST_INIT_WI_SERIAL:
@@ -90,12 +88,14 @@ lnet_selftest_exit(void)
 void
 lnet_selftest_structure_assertion(void)
 {
-       CLASSERT(sizeof(struct srpc_msg) == 160);
-       CLASSERT(sizeof(struct srpc_test_reqst) == 70);
-       CLASSERT(offsetof(struct srpc_msg, msg_body.tes_reqst.tsr_concur) == 72);
-       CLASSERT(offsetof(struct srpc_msg, msg_body.tes_reqst.tsr_ndest) == 78);
-       CLASSERT(sizeof(struct srpc_stat_reply) == 136);
-       CLASSERT(sizeof(struct srpc_stat_reqst) == 28);
+       BUILD_BUG_ON(sizeof(struct srpc_msg) != 160);
+       BUILD_BUG_ON(sizeof(struct srpc_test_reqst) != 70);
+       BUILD_BUG_ON(offsetof(struct srpc_msg, msg_body.tes_reqst.tsr_concur) !=
+                    72);
+       BUILD_BUG_ON(offsetof(struct srpc_msg, msg_body.tes_reqst.tsr_ndest) !=
+                             78);
+       BUILD_BUG_ON(sizeof(struct srpc_stat_reply) != 136);
+       BUILD_BUG_ON(sizeof(struct srpc_stat_reqst) != 28);
 }
 
 static int __init
@@ -114,7 +114,7 @@ lnet_selftest_init(void)
        lst_init_step = LST_INIT_WI_SERIAL;
 
        nscheds = cfs_cpt_number(lnet_cpt_table());
-       LIBCFS_ALLOC(lst_sched_test, sizeof(lst_sched_test[0]) * nscheds);
+       CFS_ALLOC_PTR_ARRAY(lst_sched_test, nscheds);
        if (lst_sched_test == NULL)
                goto error;