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

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

staging: lustre: lnet: change lnet_process_id_t to proper structure 



Change lnet_process_id_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 16b9ab7f

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

+6 −6
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int LNetNIFini(void); 
 * \see LNetMEAttach

 * @{

 */

int LNetGetId(unsigned int index, lnet_process_id_t *id);

int LNetGetId(unsigned int index, struct lnet_process_id *id);

int LNetDist(lnet_nid_t nid, lnet_nid_t *srcnid, __u32 *order);



/** @} lnet_addr */
@@ -93,7 +93,7 @@ int LNetDist(lnet_nid_t nid, lnet_nid_t *srcnid, __u32 *order); 
 * @{

 */

int LNetMEAttach(unsigned int      portal,

		 lnet_process_id_t match_id_in,

		 struct lnet_process_id match_id_in,

		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 lnet_unlink_t     unlink_in,
@@ -101,7 +101,7 @@ int LNetMEAttach(unsigned int portal, 
		 struct lnet_handle_me *handle_out);



int LNetMEInsert(struct lnet_handle_me current_in,

		 lnet_process_id_t match_id_in,

		 struct lnet_process_id match_id_in,

		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 lnet_unlink_t     unlink_in,
@@ -181,7 +181,7 @@ int LNetEQPoll(struct lnet_handle_eq *eventqs_in, 
int LNetPut(lnet_nid_t	      self,

	    struct lnet_handle_md md_in,

	    lnet_ack_req_t    ack_req_in,

	    lnet_process_id_t target_in,

	    struct lnet_process_id target_in,

	    unsigned int      portal_in,

	    __u64	      match_bits_in,

	    unsigned int      offset_in,
@@ -189,7 +189,7 @@ int LNetPut(lnet_nid_t self, 


int LNetGet(lnet_nid_t	      self,

	    struct lnet_handle_md md_in,

	    lnet_process_id_t target_in,

	    struct lnet_process_id target_in,

	    unsigned int      portal_in,

	    __u64	      match_bits_in,

	    unsigned int      offset_in);
@@ -202,7 +202,7 @@ int LNetGet(lnet_nid_t self, 
int LNetSetLazyPortal(int portal);

int LNetClearLazyPortal(int portal);

int LNetCtl(unsigned int cmd, void *arg);

void LNetDebugPeer(lnet_process_id_t id);

void LNetDebugPeer(struct lnet_process_id id);



/** @} lnet_misc */

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

+6 −5
Original line number Diff line number Diff line
@@ -491,8 +491,9 @@ 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, 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);

void lnet_prep_send(struct lnet_msg *msg, int type,

		    struct lnet_process_id target, unsigned int offset,

		    unsigned int len);

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

void lnet_return_tx_credits_locked(struct lnet_msg *msg);

void lnet_return_rx_credits_locked(struct lnet_msg *msg);
@@ -533,10 +534,10 @@ lnet_ptl_unsetopt(struct lnet_portal *ptl, int opt) 


/* match-table functions */

struct list_head *lnet_mt_match_head(struct lnet_match_table *mtable,

				     lnet_process_id_t id, __u64 mbits);

				     struct lnet_process_id id, __u64 mbits);

struct lnet_match_table *lnet_mt_of_attach(unsigned int index,

					   lnet_process_id_t id, __u64 mbits,

					   __u64 ignore_bits,

					   struct lnet_process_id id,

					   __u64 mbits, __u64 ignore_bits,

					   lnet_ins_pos_t pos);

int lnet_mt_match_md(struct lnet_match_table *mtable,

		     struct lnet_match_info *info, struct lnet_msg *msg);

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

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct lnet_msg { 
	struct list_head	msg_activelist;

	struct list_head	msg_list;	   /* Q for credits/MD */



	lnet_process_id_t	msg_target;

	struct lnet_process_id	msg_target;

	/* where is it from, it's only for building event */

	lnet_nid_t		msg_from;

	__u32			msg_type;
@@ -130,7 +130,7 @@ struct lnet_eq { 
struct lnet_me {

	struct list_head	 me_list;

	struct lnet_libhandle	 me_lh;

	lnet_process_id_t	 me_match_id;

	struct lnet_process_id	 me_match_id;

	unsigned int		 me_portal;

	unsigned int		 me_pos;	/* hash offset in mt_hash */

	__u64			 me_match_bits;
@@ -447,7 +447,7 @@ enum lnet_match_flags { 
/* parameter for matching operations (GET, PUT) */

struct lnet_match_info {

	__u64			mi_mbits;

	lnet_process_id_t	mi_id;

	struct lnet_process_id	mi_id;

	unsigned int		mi_opc;

	unsigned int		mi_portal;

	unsigned int		mi_rlength;

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

+6 −6
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct lst_bid { 
#define LST_NODE_UNKNOWN	0x8	/* node not in session */



struct lstcon_node_ent {

	lnet_process_id_t       nde_id;		/* id of node */

	struct lnet_process_id	nde_id;		/* id of node */

	int			nde_state;	/* state of node */

};				/*** node entry, for list_group command */
@@ -126,7 +126,7 @@ struct lstcon_test_batch_ent { 


struct lstcon_rpc_ent {

	struct list_head	rpe_link;	/* link chain */

	lnet_process_id_t	rpe_peer;	/* peer's id */

	struct lnet_process_id	rpe_peer;	/* peer's id */

	struct timeval		rpe_stamp;	/* time stamp of RPC */

	int			rpe_state;	/* peer's state */

	int			rpe_rpc_errno;	/* RPC errno */
@@ -287,7 +287,7 @@ struct lstio_debug_args { 
							       group|batch */

	int			 lstio_dbg_count;	/* IN: # of test nodes

							       to debug */

	lnet_process_id_t __user *lstio_dbg_idsp;	/* IN: id of test

	struct lnet_process_id __user *lstio_dbg_idsp;	/* IN: id of test

							       nodes */

	struct list_head __user	*lstio_dbg_resultp;	/* OUT: list head of

								result buffer */
@@ -317,7 +317,7 @@ struct lstio_group_update_args { 
	int			 lstio_grp_nmlen;	/* IN: name length */

	char __user		*lstio_grp_namep;	/* IN: group name */

	int			 lstio_grp_count;	/* IN: # of nodes id */

	lnet_process_id_t __user *lstio_grp_idsp;	/* IN: array of nodes */

	struct lnet_process_id __user *lstio_grp_idsp;	/* IN: array of nodes */

	struct list_head __user	*lstio_grp_resultp;	/* OUT: list head of

								result buffer */

};
@@ -329,7 +329,7 @@ struct lstio_group_nodes_args { 
	int			 lstio_grp_count;	/* IN: # of nodes */

	/** OUT: session features */

	unsigned int __user	*lstio_grp_featp;

	lnet_process_id_t __user *lstio_grp_idsp;	/* IN: nodes */

	struct lnet_process_id __user *lstio_grp_idsp;	/* IN: nodes */

	struct list_head __user	*lstio_grp_resultp;	/* OUT: list head of

								result buffer */

};
@@ -429,7 +429,7 @@ struct lstio_stat_args { 
							       length */

	char __user		*lstio_sta_namep;	/* IN: group name */

	int			 lstio_sta_count;	/* IN: # of pid */

	lnet_process_id_t __user *lstio_sta_idsp;	/* IN: pid */

	struct lnet_process_id __user *lstio_sta_idsp;	/* IN: pid */

	struct list_head __user	*lstio_sta_resultp;	/* OUT: list head of

								result buffer */

};

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline char *libcfs_nid2str(lnet_nid_t nid) 
__u32 libcfs_str2net(const char *str);

lnet_nid_t libcfs_str2nid(const char *str);

int libcfs_str2anynid(lnet_nid_t *nid, const char *str);

char *libcfs_id2str(lnet_process_id_t id);

char *libcfs_id2str(struct lnet_process_id id);

void cfs_free_nidlist(struct list_head *list);

int cfs_parse_nidlist(char *str, int len, struct list_head *list);

int cfs_print_nidlist(char *buffer, int count, struct list_head *list);