Commit 76f2507b authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: lnet: change msg union in struct lnet_hdr to proper structure

Modify all the msg union fields from typedefs to
to proper structures.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/24566Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c532c91f
...@@ -146,36 +146,36 @@ typedef enum { ...@@ -146,36 +146,36 @@ typedef enum {
* wire structs MUST be fixed size and the smaller types are placed at the * wire structs MUST be fixed size and the smaller types are placed at the
* end. * end.
*/ */
typedef struct lnet_ack { struct lnet_ack {
struct lnet_handle_wire dst_wmd; struct lnet_handle_wire dst_wmd;
__u64 match_bits; __u64 match_bits;
__u32 mlength; __u32 mlength;
} WIRE_ATTR lnet_ack_t; } WIRE_ATTR;
typedef struct lnet_put { struct lnet_put {
struct lnet_handle_wire ack_wmd; struct lnet_handle_wire ack_wmd;
__u64 match_bits; __u64 match_bits;
__u64 hdr_data; __u64 hdr_data;
__u32 ptl_index; __u32 ptl_index;
__u32 offset; __u32 offset;
} WIRE_ATTR lnet_put_t; } WIRE_ATTR;
typedef struct lnet_get { struct lnet_get {
struct lnet_handle_wire return_wmd; struct lnet_handle_wire return_wmd;
__u64 match_bits; __u64 match_bits;
__u32 ptl_index; __u32 ptl_index;
__u32 src_offset; __u32 src_offset;
__u32 sink_length; __u32 sink_length;
} WIRE_ATTR lnet_get_t; } WIRE_ATTR;
typedef struct lnet_reply { struct lnet_reply {
struct lnet_handle_wire dst_wmd; struct lnet_handle_wire dst_wmd;
} WIRE_ATTR lnet_reply_t; } WIRE_ATTR;
typedef struct lnet_hello { struct lnet_hello {
__u64 incarnation; __u64 incarnation;
__u32 type; __u32 type;
} WIRE_ATTR lnet_hello_t; } WIRE_ATTR;
struct lnet_hdr { struct lnet_hdr {
lnet_nid_t dest_nid; lnet_nid_t dest_nid;
...@@ -186,11 +186,11 @@ struct lnet_hdr { ...@@ -186,11 +186,11 @@ struct lnet_hdr {
__u32 payload_length; /* payload data to follow */ __u32 payload_length; /* payload data to follow */
/*<------__u64 aligned------->*/ /*<------__u64 aligned------->*/
union { union {
lnet_ack_t ack; struct lnet_ack ack;
lnet_put_t put; struct lnet_put put;
lnet_get_t get; struct lnet_get get;
lnet_reply_t reply; struct lnet_reply reply;
lnet_hello_t hello; struct lnet_hello hello;
} msg; } msg;
} WIRE_ATTR; } WIRE_ATTR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment