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

staging: lustre: lnet: change lnet_handle_me_t to proper struct 



Change lnet_handle_me_t from a typedef of another typedef into
a proper stand alone structure.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831


Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9bcb80cb

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

+5 −5
Original line number Diff line number Diff line
@@ -99,17 +99,17 @@ int LNetMEAttach(unsigned int portal, 
		 __u64		   ignore_bits_in,

		 lnet_unlink_t     unlink_in,

		 lnet_ins_pos_t    pos_in,

		 lnet_handle_me_t *handle_out);

		 struct lnet_handle_me *handle_out);



int LNetMEInsert(lnet_handle_me_t  current_in,

int LNetMEInsert(struct lnet_handle_me current_in,

		 lnet_process_id_t match_id_in,

		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 lnet_unlink_t     unlink_in,

		 lnet_ins_pos_t    position_in,

		 lnet_handle_me_t *handle_out);

		 struct lnet_handle_me *handle_out);



int LNetMEUnlink(lnet_handle_me_t current_in);

int LNetMEUnlink(struct lnet_handle_me current_in);

/** @} lnet_me */



/** \defgroup lnet_md Memory descriptors
@@ -125,7 +125,7 @@ int LNetMEUnlink(lnet_handle_me_t current_in); 
 * associated with a MD: LNetMDUnlink().

 * @{

 */

int LNetMDAttach(lnet_handle_me_t  current_in,

int LNetMDAttach(struct lnet_handle_me current_in,

		 lnet_md_t	   md_in,

		 lnet_unlink_t     unlink_in,

		 struct lnet_handle_md *md_handle_out);

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

+2 −2
Original line number Diff line number Diff line
@@ -342,13 +342,13 @@ lnet_wire_handle2md(struct lnet_handle_wire *wh) 
}



static inline void

lnet_me2handle(lnet_handle_me_t *handle, lnet_me_t *me)

lnet_me2handle(struct lnet_handle_me *handle, lnet_me_t *me)

{

	handle->cookie = me->me_lh.lh_cookie;

}



static inline lnet_me_t *

lnet_handle2me(lnet_handle_me_t *handle)

lnet_handle2me(struct lnet_handle_me *handle)

{

	/* ALWAYS called with resource lock held */

	lnet_libhandle_t *lh;

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

+4 −2
Original line number Diff line number Diff line
@@ -284,8 +284,6 @@ typedef struct { 
	__u64	 cookie;

} lnet_handle_any_t;



typedef lnet_handle_any_t lnet_handle_me_t;



#define LNET_WIRE_HANDLE_COOKIE_NONE   (-1)



/**
@@ -360,6 +358,10 @@ static inline int LNetMDHandleIsInvalid(struct lnet_handle_md h) 
	return (LNET_WIRE_HANDLE_COOKIE_NONE == h.cookie);

}



struct lnet_handle_me {

	u64	cookie;

};



/**

 * Global process ID.

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ lnet_ping_info_setup(struct lnet_ping_info **ppinfo, 
		     int ni_count, bool set_eq)

{

	lnet_process_id_t id = {LNET_NID_ANY, LNET_PID_ANY};

	lnet_handle_me_t me_handle;

	struct lnet_handle_me me_handle;

	lnet_md_t md = { NULL };

	int rc, rc2;

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ lnet_md_validate(lnet_md_t *umd) 
 * a MD.

 */

int

LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd,

LNetMDAttach(struct lnet_handle_me meh, lnet_md_t umd,

	     lnet_unlink_t unlink, struct lnet_handle_md *handle)

{

	LIST_HEAD(matches);