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

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

staging: lustre: lnet: change lnet_handle_wire_t to proper structure 



Change lnet_handle_wire_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 41a5d7c0

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

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline int lnet_is_route_alive(lnet_route_t *route) 
	return route->lr_downis == 0;

}



static inline int lnet_is_wire_handle_none(lnet_handle_wire_t *wh)

static inline int lnet_is_wire_handle_none(struct lnet_handle_wire *wh)

{

	return (wh->wh_interface_cookie == LNET_WIRE_HANDLE_COOKIE_NONE &&

		wh->wh_object_cookie == LNET_WIRE_HANDLE_COOKIE_NONE);
@@ -323,7 +323,7 @@ lnet_handle2md(lnet_handle_md_t *handle) 
}



static inline lnet_libmd_t *

lnet_wire_handle2md(lnet_handle_wire_t *wh)

lnet_wire_handle2md(struct lnet_handle_wire *wh)

{

	/* ALWAYS called with resource lock held */

	lnet_libhandle_t *lh;

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

+6 −6
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ typedef struct { 
 * reboots).  The object cookie only matches one object on that interface

 * during that object's lifetime (i.e. no cookie re-use).

 */

typedef struct {

struct lnet_handle_wire {

	__u64	wh_interface_cookie;

	__u64	wh_object_cookie;

} WIRE_ATTR lnet_handle_wire_t;

} WIRE_ATTR;



typedef enum {

	LNET_MSG_ACK = 0,
@@ -147,13 +147,13 @@ typedef enum { 
 * end.

 */

typedef struct lnet_ack {

	lnet_handle_wire_t	dst_wmd;

	struct lnet_handle_wire	dst_wmd;

	__u64			match_bits;

	__u32			mlength;

} WIRE_ATTR lnet_ack_t;



typedef struct lnet_put {

	lnet_handle_wire_t	ack_wmd;

	struct lnet_handle_wire	ack_wmd;

	__u64			match_bits;

	__u64			hdr_data;

	__u32			ptl_index;
@@ -161,7 +161,7 @@ typedef struct lnet_put { 
} WIRE_ATTR lnet_put_t;



typedef struct lnet_get {

	lnet_handle_wire_t	return_wmd;

	struct lnet_handle_wire	return_wmd;

	__u64			match_bits;

	__u32			ptl_index;

	__u32			src_offset;
@@ -169,7 +169,7 @@ typedef struct lnet_get { 
} WIRE_ATTR lnet_get_t;



typedef struct lnet_reply {

	lnet_handle_wire_t	dst_wmd;

	struct lnet_handle_wire	dst_wmd;

} WIRE_ATTR lnet_reply_t;



typedef struct lnet_hello {

drivers/staging/lustre/lnet/lnet/api-ni.c

+5 −5
Original line number Diff line number Diff line
@@ -190,11 +190,11 @@ static void lnet_assert_wire_constants(void) 
	CLASSERT(LNET_MSG_HELLO == 4);



	/* Checks for struct ptl_handle_wire_t */

	CLASSERT((int)sizeof(lnet_handle_wire_t) == 16);

	CLASSERT((int)offsetof(lnet_handle_wire_t, wh_interface_cookie) == 0);

	CLASSERT((int)sizeof(((lnet_handle_wire_t *)0)->wh_interface_cookie) == 8);

	CLASSERT((int)offsetof(lnet_handle_wire_t, wh_object_cookie) == 8);

	CLASSERT((int)sizeof(((lnet_handle_wire_t *)0)->wh_object_cookie) == 8);

	CLASSERT((int)sizeof(struct lnet_handle_wire) == 16);

	CLASSERT((int)offsetof(struct lnet_handle_wire, wh_interface_cookie) == 0);

	CLASSERT((int)sizeof(((struct lnet_handle_wire *)0)->wh_interface_cookie) == 8);

	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 struct lnet_magicversion_t */

	CLASSERT((int)sizeof(lnet_magicversion_t) == 8);

drivers/staging/lustre/lnet/lnet/lib-move.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ lnet_parse_get(lnet_ni_t *ni, lnet_msg_t *msg, int rdma_get) 
{

	struct lnet_match_info info;

	lnet_hdr_t *hdr = &msg->msg_hdr;

	lnet_handle_wire_t reply_wmd;

	struct lnet_handle_wire reply_wmd;

	int rc;



	/* Convert get fields to host byte order */

drivers/staging/lustre/lnet/lnet/lib-msg.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ lnet_msg_detach_md(lnet_msg_t *msg, int status) 
static int

lnet_complete_msg_locked(lnet_msg_t *msg, int cpt)

{

	lnet_handle_wire_t ack_wmd;

	struct lnet_handle_wire ack_wmd;

	int rc;

	int status = msg->msg_ev.status;