LU-7734 lnet: use 'struct lnet_magicversion' in wirecheck

Replace lnet_magicversion_t with struct lnet_magicversion in
wirecheck.c and the code it generates.

Test-Parameters: trivial
Signed-off-by: Olaf Weber <olaf@sgi.com>
Change-Id: I899794b15e2b609891103bf53175bb2ceba80d12

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index f3e2a1d..c298642 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -267,14 +267,14 @@ static void lnet_assert_wire_constants(void)
        CLASSERT((int)offsetof(struct lnet_handle_wire, wh_object_cookie) == 8);
        CLASSERT((int)sizeof(((struct lnet_handle_wire *)0)->wh_object_cookie) == 8);
 
-       /* Checks for lnet_magicversion_t */
-       CLASSERT((int)sizeof(lnet_magicversion_t) == 8);
-       CLASSERT((int)offsetof(lnet_magicversion_t, magic) == 0);
-       CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->magic) == 4);
-       CLASSERT((int)offsetof(lnet_magicversion_t, version_major) == 4);
-       CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->version_major) == 2);
-       CLASSERT((int)offsetof(lnet_magicversion_t, version_minor) == 6);
-       CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->version_minor) == 2);
+       /* Checks for struct lnet_magicversion */
+       CLASSERT((int)sizeof(struct lnet_magicversion) == 8);
+       CLASSERT((int)offsetof(struct lnet_magicversion, magic) == 0);
+       CLASSERT((int)sizeof(((struct lnet_magicversion *)0)->magic) == 4);
+       CLASSERT((int)offsetof(struct lnet_magicversion, version_major) == 4);
+       CLASSERT((int)sizeof(((struct lnet_magicversion *)0)->version_major) == 2);
+       CLASSERT((int)offsetof(struct lnet_magicversion, version_minor) == 6);
+       CLASSERT((int)sizeof(((struct lnet_magicversion *)0)->version_minor) == 2);
 
        /* Checks for lnet_hdr_t */
        CLASSERT((int)sizeof(lnet_hdr_t) == 72);

diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index 5d66aa1..82d6054 100644 (file)
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -103,10 +103,10 @@ check_lnet_handle_wire(void)
 void
 check_lnet_magicversion(void)
 {
-       CHECK_STRUCT(lnet_magicversion_t);
-       CHECK_MEMBER(lnet_magicversion_t, magic);
-       CHECK_MEMBER(lnet_magicversion_t, version_major);
-       CHECK_MEMBER(lnet_magicversion_t, version_minor);
+       CHECK_STRUCT(struct lnet_magicversion);
+       CHECK_MEMBER(struct lnet_magicversion, magic);
+       CHECK_MEMBER(struct lnet_magicversion, version_major);
+       CHECK_MEMBER(struct lnet_magicversion, version_minor);
 }
 
 void