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

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

staging: lustre: lnet: change lnet_ins_pos_t to proper enum 



Change lnet_ins_pos_t from typedef to proper enum.

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 058b88d3

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

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int LNetMEAttach(unsigned int portal, 
		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 enum lnet_unlink unlink_in,

		 lnet_ins_pos_t    pos_in,

		 enum lnet_ins_pos pos_in,

		 struct lnet_handle_me *handle_out);



int LNetMEInsert(struct lnet_handle_me current_in,
@@ -105,7 +105,7 @@ int LNetMEInsert(struct lnet_handle_me current_in, 
		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 enum lnet_unlink unlink_in,

		 lnet_ins_pos_t    position_in,

		 enum lnet_ins_pos position_in,

		 struct lnet_handle_me *handle_out);



int LNetMEUnlink(struct lnet_handle_me current_in);

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

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ struct list_head *lnet_mt_match_head(struct lnet_match_table *mtable, 
struct lnet_match_table *lnet_mt_of_attach(unsigned int index,

					   struct lnet_process_id id,

					   __u64 mbits, __u64 ignore_bits,

					   lnet_ins_pos_t pos);

					   enum lnet_ins_pos 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/types.h

+3 −3
Original line number Diff line number Diff line
@@ -352,20 +352,20 @@ enum lnet_unlink { 
};



/**

 * Values of the type lnet_ins_pos_t are used to control where a new match

 * Values of the type lnet_ins_pos are used to control where a new match

 * entry is inserted. The value LNET_INS_BEFORE is used to insert the new

 * entry before the current entry or before the head of the list. The value

 * LNET_INS_AFTER is used to insert the new entry after the current entry

 * or after the last item in the list.

 */

typedef enum {

enum lnet_ins_pos {

	/** insert ME before current position or head of the list */

	LNET_INS_BEFORE,

	/** insert ME after current position or tail of the list */

	LNET_INS_AFTER,

	/** attach ME at tail of local CPU partition ME list */

	LNET_INS_LOCAL

} lnet_ins_pos_t;

};



/** @} lnet_me */

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

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int 
LNetMEAttach(unsigned int portal,

	     struct lnet_process_id match_id,

	     __u64 match_bits, __u64 ignore_bits,

	     enum lnet_unlink unlink, lnet_ins_pos_t pos,

	     enum lnet_unlink unlink, enum lnet_ins_pos pos,

	     struct lnet_handle_me *handle)

{

	struct lnet_match_table *mtable;
@@ -143,7 +143,7 @@ int 
LNetMEInsert(struct lnet_handle_me current_meh,

	     struct lnet_process_id match_id,

	     __u64 match_bits, __u64 ignore_bits,

	     enum lnet_unlink unlink, lnet_ins_pos_t pos,

	     enum lnet_unlink unlink, enum lnet_ins_pos pos,

	     struct lnet_handle_me *handle)

{

	struct lnet_me *current_me;

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

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ lnet_match2mt(struct lnet_portal *ptl, struct lnet_process_id id, __u64 mbits) 


struct lnet_match_table *

lnet_mt_of_attach(unsigned int index, struct lnet_process_id id,

		  __u64 mbits, __u64 ignore_bits, lnet_ins_pos_t pos)

		  __u64 mbits, __u64 ignore_bits, enum lnet_ins_pos pos)

{

	struct lnet_portal *ptl;

	struct lnet_match_table	*mtable;