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

Replace lnet_hdr_t with struct lnet_hdr in wirecheck.c and the
code it generates.

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

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index c298642..0f50c65 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -276,64 +276,64 @@ static void lnet_assert_wire_constants(void)
        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);
-       CLASSERT((int)offsetof(lnet_hdr_t, dest_nid) == 0);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->dest_nid) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, src_nid) == 8);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->src_nid) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, dest_pid) == 16);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->dest_pid) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, src_pid) == 20);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->src_pid) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, type) == 24);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->type) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, payload_length) == 28);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->payload_length) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg) == 32);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg) == 40);
+       /* Checks for struct lnet_hdr */
+       CLASSERT((int)sizeof(struct lnet_hdr) == 72);
+       CLASSERT((int)offsetof(struct lnet_hdr, dest_nid) == 0);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->dest_nid) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, src_nid) == 8);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->src_nid) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, dest_pid) == 16);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->dest_pid) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, src_pid) == 20);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->src_pid) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, type) == 24);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->type) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, payload_length) == 28);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->payload_length) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg) == 32);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg) == 40);
 
        /* Ack */
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.ack.dst_wmd) == 32);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.ack.dst_wmd) == 16);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.ack.match_bits) == 48);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.ack.match_bits) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.ack.mlength) == 56);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.ack.mlength) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.ack.dst_wmd) == 32);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.ack.dst_wmd) == 16);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.ack.match_bits) == 48);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.ack.match_bits) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.ack.mlength) == 56);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.ack.mlength) == 4);
 
        /* Put */
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.put.ack_wmd) == 32);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.ack_wmd) == 16);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.put.match_bits) == 48);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.match_bits) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.put.hdr_data) == 56);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.hdr_data) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.put.ptl_index) == 64);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.ptl_index) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.put.offset) == 68);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.offset) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.put.ack_wmd) == 32);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.put.ack_wmd) == 16);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.put.match_bits) == 48);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.put.match_bits) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.put.hdr_data) == 56);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.put.hdr_data) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.put.ptl_index) == 64);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.put.ptl_index) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.put.offset) == 68);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.put.offset) == 4);
 
        /* Get */
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.get.return_wmd) == 32);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.return_wmd) == 16);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.get.match_bits) == 48);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.match_bits) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.get.ptl_index) == 56);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.ptl_index) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.get.src_offset) == 60);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.src_offset) == 4);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.get.sink_length) == 64);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.sink_length) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.get.return_wmd) == 32);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.get.return_wmd) == 16);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.get.match_bits) == 48);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.get.match_bits) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.get.ptl_index) == 56);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.get.ptl_index) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.get.src_offset) == 60);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.get.src_offset) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.get.sink_length) == 64);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.get.sink_length) == 4);
 
        /* Reply */
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.reply.dst_wmd) == 32);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.reply.dst_wmd) == 16);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.reply.dst_wmd) == 32);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.reply.dst_wmd) == 16);
 
        /* Hello */
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.hello.incarnation) == 32);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.hello.incarnation) == 8);
-       CLASSERT((int)offsetof(lnet_hdr_t, msg.hello.type) == 40);
-       CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.hello.type) == 4);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.hello.incarnation) == 32);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.hello.incarnation) == 8);
+       CLASSERT((int)offsetof(struct lnet_hdr, msg.hello.type) == 40);
+       CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.hello.type) == 4);
 }
 
 static lnd_t *lnet_find_lnd_by_type(__u32 type)

diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index 82d6054..97bfa8b 100644 (file)
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -112,45 +112,45 @@ check_lnet_magicversion(void)
 void
 check_lnet_hdr(void)
 {
-       CHECK_STRUCT(lnet_hdr_t);
-       CHECK_MEMBER(lnet_hdr_t, dest_nid);
-       CHECK_MEMBER(lnet_hdr_t, src_nid);
-       CHECK_MEMBER(lnet_hdr_t, dest_pid);
-       CHECK_MEMBER(lnet_hdr_t, src_pid);
-       CHECK_MEMBER(lnet_hdr_t, type);
-       CHECK_MEMBER(lnet_hdr_t, payload_length);
-       CHECK_MEMBER(lnet_hdr_t, msg);
+       CHECK_STRUCT(struct lnet_hdr);
+       CHECK_MEMBER(struct lnet_hdr, dest_nid);
+       CHECK_MEMBER(struct lnet_hdr, src_nid);
+       CHECK_MEMBER(struct lnet_hdr, dest_pid);
+       CHECK_MEMBER(struct lnet_hdr, src_pid);
+       CHECK_MEMBER(struct lnet_hdr, type);
+       CHECK_MEMBER(struct lnet_hdr, payload_length);
+       CHECK_MEMBER(struct lnet_hdr, msg);
 
        BLANK_LINE();
        COMMENT("Ack");
-       CHECK_MEMBER(lnet_hdr_t, msg.ack.dst_wmd);
-       CHECK_MEMBER(lnet_hdr_t, msg.ack.match_bits);
-       CHECK_MEMBER(lnet_hdr_t, msg.ack.mlength);
+       CHECK_MEMBER(struct lnet_hdr, msg.ack.dst_wmd);
+       CHECK_MEMBER(struct lnet_hdr, msg.ack.match_bits);
+       CHECK_MEMBER(struct lnet_hdr, msg.ack.mlength);
 
        BLANK_LINE();
        COMMENT("Put");
-       CHECK_MEMBER(lnet_hdr_t, msg.put.ack_wmd);
-       CHECK_MEMBER(lnet_hdr_t, msg.put.match_bits);
-       CHECK_MEMBER(lnet_hdr_t, msg.put.hdr_data);
-       CHECK_MEMBER(lnet_hdr_t, msg.put.ptl_index);
-       CHECK_MEMBER(lnet_hdr_t, msg.put.offset);
+       CHECK_MEMBER(struct lnet_hdr, msg.put.ack_wmd);
+       CHECK_MEMBER(struct lnet_hdr, msg.put.match_bits);
+       CHECK_MEMBER(struct lnet_hdr, msg.put.hdr_data);
+       CHECK_MEMBER(struct lnet_hdr, msg.put.ptl_index);
+       CHECK_MEMBER(struct lnet_hdr, msg.put.offset);
 
        BLANK_LINE();
        COMMENT("Get");
-       CHECK_MEMBER(lnet_hdr_t, msg.get.return_wmd);
-       CHECK_MEMBER(lnet_hdr_t, msg.get.match_bits);
-       CHECK_MEMBER(lnet_hdr_t, msg.get.ptl_index);
-       CHECK_MEMBER(lnet_hdr_t, msg.get.src_offset);
-       CHECK_MEMBER(lnet_hdr_t, msg.get.sink_length);
+       CHECK_MEMBER(struct lnet_hdr, msg.get.return_wmd);
+       CHECK_MEMBER(struct lnet_hdr, msg.get.match_bits);
+       CHECK_MEMBER(struct lnet_hdr, msg.get.ptl_index);
+       CHECK_MEMBER(struct lnet_hdr, msg.get.src_offset);
+       CHECK_MEMBER(struct lnet_hdr, msg.get.sink_length);
 
        BLANK_LINE();
        COMMENT("Reply");
-       CHECK_MEMBER(lnet_hdr_t, msg.reply.dst_wmd);
+       CHECK_MEMBER(struct lnet_hdr, msg.reply.dst_wmd);
 
        BLANK_LINE();
        COMMENT("Hello");
-       CHECK_MEMBER(lnet_hdr_t, msg.hello.incarnation);
-       CHECK_MEMBER(lnet_hdr_t, msg.hello.type);
+       CHECK_MEMBER(struct lnet_hdr, msg.hello.incarnation);
+       CHECK_MEMBER(struct lnet_hdr, msg.hello.type);
 }
 
 void