Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c532c91f authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: change lnet_hdr_t to proper structure 



Change lnet_hdr_t from typedef to proper structure.

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/24566


Reviewed-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 5f991c4c

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+4 −4
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ int lnet_portals_create(void); 
void lnet_portals_destroy(void);



/* message functions */

int lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr,

int lnet_parse(lnet_ni_t *ni, struct lnet_hdr *hdr,

	       lnet_nid_t fromnid, void *private, int rdma_req);

int lnet_parse_local(lnet_ni_t *ni, lnet_msg_t *msg);

int lnet_parse_forward_locked(lnet_ni_t *ni, lnet_msg_t *msg);
@@ -579,7 +579,7 @@ void lnet_msg_containers_destroy(void); 
int lnet_msg_containers_create(void);



char *lnet_msgtyp2str(int type);

void lnet_print_hdr(lnet_hdr_t *hdr);

void lnet_print_hdr(struct lnet_hdr *hdr);

int lnet_fail_nid(lnet_nid_t nid, unsigned int threshold);



/** \addtogroup lnet_fault_simulation @{ */
@@ -588,7 +588,7 @@ int lnet_fault_ctl(int cmd, struct libcfs_ioctl_data *data); 
int lnet_fault_init(void);

void lnet_fault_fini(void);



bool lnet_drop_rule_match(lnet_hdr_t *hdr);

bool lnet_drop_rule_match(struct lnet_hdr *hdr);



int lnet_delay_rule_add(struct lnet_fault_attr *attr);

int lnet_delay_rule_del(lnet_nid_t src, lnet_nid_t dst, bool shutdown);
@@ -596,7 +596,7 @@ int lnet_delay_rule_list(int pos, struct lnet_fault_attr *attr, 
			 struct lnet_fault_stat *stat);

void lnet_delay_rule_reset(void);

void lnet_delay_rule_check(void);

bool lnet_delay_rule_match_locked(lnet_hdr_t *hdr, struct lnet_msg *msg);

bool lnet_delay_rule_match_locked(struct lnet_hdr *hdr, struct lnet_msg *msg);



/** @} lnet_fault_simulation */

drivers/staging/lustre/include/linux/lnet/lib-types.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ typedef struct lnet_msg { 
	lnet_kiov_t		*msg_kiov;



	lnet_event_t		 msg_ev;

	lnet_hdr_t		 msg_hdr;

	struct lnet_hdr		 msg_hdr;

} lnet_msg_t;



typedef struct lnet_libhandle {

drivers/staging/lustre/include/linux/lnet/socklnd.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ typedef struct { 
} WIRE_ATTR ksock_hello_msg_t;



typedef struct {

	lnet_hdr_t	ksnm_hdr;	/* lnet hdr */

	struct lnet_hdr	ksnm_hdr;	/* lnet hdr */



	/*

	 * ksnm_payload is removed because of winnt compiler's limitation:

drivers/staging/lustre/include/linux/lnet/types.h

+3 −3
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ typedef struct lnet_hello { 
	__u32			type;

} WIRE_ATTR lnet_hello_t;



typedef struct {

struct lnet_hdr {

	lnet_nid_t	dest_nid;

	lnet_nid_t	src_nid;

	lnet_pid_t	dest_pid;
@@ -192,7 +192,7 @@ typedef struct { 
		lnet_reply_t	reply;

		lnet_hello_t	hello;

	} msg;

} WIRE_ATTR lnet_hdr_t;

} WIRE_ATTR;



/*

 * A HELLO message contains a magic number and protocol version
@@ -202,7 +202,7 @@ typedef struct { 
 * This is for use by byte-stream LNDs (e.g. TCP/IP) to check the peer is

 * running the same protocol and to find out its NID. These LNDs should

 * exchange HELLO messages when a connection is first established.  Individual

 * LNDs can put whatever else they fancy in lnet_hdr_t::msg.

 * LNDs can put whatever else they fancy in struct lnet_hdr::msg.

 */

struct lnet_magicversion {

	__u32	magic;		/* LNET_PROTO_TCP_MAGIC */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h

+3 −3
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ struct kib_connparams { 
} WIRE_ATTR;



struct kib_immediate_msg {

	lnet_hdr_t   ibim_hdr;        /* portals header */

	struct lnet_hdr	ibim_hdr;        /* portals header */

	char         ibim_payload[0]; /* piggy-backed payload */

} WIRE_ATTR;
@@ -380,7 +380,7 @@ struct kib_rdma_desc { 
} WIRE_ATTR;



struct kib_putreq_msg {

	lnet_hdr_t      ibprm_hdr;    /* portals header */

	struct lnet_hdr	ibprm_hdr;    /* portals header */

	__u64           ibprm_cookie; /* opaque completion cookie */

} WIRE_ATTR;
@@ -391,7 +391,7 @@ struct kib_putack_msg { 
} WIRE_ATTR;



struct kib_get_msg {

	lnet_hdr_t      ibgm_hdr;     /* portals header */

	struct lnet_hdr ibgm_hdr;     /* portals header */

	__u64           ibgm_cookie;  /* opaque completion cookie */

	struct kib_rdma_desc ibgm_rd;      /* rdma descriptor */

} WIRE_ATTR;