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

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

staging: lustre: lnet: change lnet_event_t to proper structure 



Change lnet_event_t from typedef to proper 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 ef391eac

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

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int LNetMDUnlink(struct lnet_handle_md md_in); 
 *

 * In addition to the lnet_handle_eq, the LNet API defines two types

 * associated with events: The ::lnet_event_kind_t defines the kinds of events

 * that can be stored in an EQ. The lnet_event_t defines a structure that

 * that can be stored in an EQ. The lnet_event defines a structure that

 * holds the information about with an event.

 *

 * There are five functions for dealing with EQs: LNetEQAlloc() is used to
@@ -168,7 +168,7 @@ int LNetEQFree(struct lnet_handle_eq eventq_in); 
int LNetEQPoll(struct lnet_handle_eq *eventqs_in,

	       int		 neq_in,

	       int		 timeout_ms,

	       lnet_event_t     *event_out,

	       struct lnet_event *event_out,

	       int		*which_eq_out);

/** @} lnet_eq */

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

+2 −2
Original line number Diff line number Diff line
@@ -485,12 +485,12 @@ int lnet_islocalnet(__u32 net); 
void lnet_msg_attach_md(struct lnet_msg *msg, struct lnet_libmd *md,

			unsigned int offset, unsigned int mlen);

void lnet_msg_detach_md(struct lnet_msg *msg, int status);

void lnet_build_unlink_event(struct lnet_libmd *md, lnet_event_t *ev);

void lnet_build_unlink_event(struct lnet_libmd *md, struct lnet_event *ev);

void lnet_build_msg_event(struct lnet_msg *msg, lnet_event_kind_t ev_type);

void lnet_msg_commit(struct lnet_msg *msg, int cpt);

void lnet_msg_decommit(struct lnet_msg *msg, int cpt, int status);



void lnet_eq_enqueue_event(struct lnet_eq *eq, lnet_event_t *ev);

void lnet_eq_enqueue_event(struct lnet_eq *eq, struct lnet_event *ev);

void lnet_prep_send(struct lnet_msg *msg, int type, lnet_process_id_t target,

		    unsigned int offset, unsigned int len);

int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid);

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

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct lnet_msg { 
	struct kvec		*msg_iov;

	lnet_kiov_t		*msg_kiov;



	lnet_event_t		 msg_ev;

	struct lnet_event	 msg_ev;

	struct lnet_hdr		 msg_hdr;

};
@@ -123,7 +123,7 @@ struct lnet_eq { 
	lnet_seq_t		  eq_deq_seq;

	unsigned int		  eq_size;

	lnet_eq_handler_t	  eq_callback;

	lnet_event_t		 *eq_events;

	struct lnet_event	 *eq_events;

	int			**eq_refs;	/* percpt refcount for EQ */

};

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

+3 −3
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ typedef unsigned LNET_SEQ_BASETYPE lnet_seq_t; 
/**

 * Information about an event on a MD.

 */

typedef struct {

struct lnet_event {

	/** The identifier (nid, pid) of the target. */

	lnet_process_id_t	target;

	/** The identifier (nid, pid) of the initiator. */
@@ -635,7 +635,7 @@ typedef struct { 
	 * to each event.

	 */

	volatile lnet_seq_t	sequence;

} lnet_event_t;

};



/**

 * Event queue handler function type.
@@ -647,7 +647,7 @@ typedef struct { 
 * The handler must not block, must be reentrant, and must not call any LNet

 * API functions. It should return as quickly as possible.

 */

typedef void (*lnet_eq_handler_t)(lnet_event_t *event);

typedef void (*lnet_eq_handler_t)(struct lnet_event *event);

#define LNET_EQ_HANDLER_NONE NULL

/** @} lnet_eq */

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

+2 −2
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ lnet_ping_info_destroy(void) 
}



static void

lnet_ping_event_handler(lnet_event_t *event)

lnet_ping_event_handler(struct lnet_event *event)

{

	struct lnet_ping_info *pinfo = event->md.user_ptr;
@@ -2133,7 +2133,7 @@ static int lnet_ping(lnet_process_id_t id, int timeout_ms, 
{

	struct lnet_handle_eq eqh;

	struct lnet_handle_md mdh;

	lnet_event_t event;

	struct lnet_event event;

	struct lnet_md md = { NULL };

	int which;

	int unlinked = 0;