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

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

staging: lustre: lnet: change lnet_unlink_t to proper enum 



Change lnet_unlink_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 77f49e9b

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

+4 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int LNetMEAttach(unsigned int portal, 
		 struct lnet_process_id match_id_in,

		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 lnet_unlink_t     unlink_in,

		 enum lnet_unlink unlink_in,

		 lnet_ins_pos_t    pos_in,

		 struct lnet_handle_me *handle_out);
@@ -104,7 +104,7 @@ int LNetMEInsert(struct lnet_handle_me current_in, 
		 struct lnet_process_id match_id_in,

		 __u64		   match_bits_in,

		 __u64		   ignore_bits_in,

		 lnet_unlink_t     unlink_in,

		 enum lnet_unlink unlink_in,

		 lnet_ins_pos_t    position_in,

		 struct lnet_handle_me *handle_out);
@@ -126,11 +126,11 @@ int LNetMEUnlink(struct lnet_handle_me current_in); 
 */

int LNetMDAttach(struct lnet_handle_me current_in,

		 struct lnet_md md_in,

		 lnet_unlink_t     unlink_in,

		 enum lnet_unlink unlink_in,

		 struct lnet_handle_md *md_handle_out);



int LNetMDBind(struct lnet_md md_in,

	       lnet_unlink_t       unlink_in,

	       enum lnet_unlink unlink_in,

	       struct lnet_handle_md *md_handle_out);



int LNetMDUnlink(struct lnet_handle_md md_in);

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

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct lnet_me { 
	unsigned int		 me_pos;	/* hash offset in mt_hash */

	__u64			 me_match_bits;

	__u64			 me_ignore_bits;

	lnet_unlink_t		 me_unlink;

	enum lnet_unlink	 me_unlink;

	struct lnet_libmd	*me_md;

};

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

+2 −2
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ struct lnet_process_id { 
 * Specifies whether the match entry or memory descriptor should be unlinked

 * automatically (LNET_UNLINK) or not (LNET_RETAIN).

 */

typedef enum {

enum lnet_unlink {

	LNET_RETAIN = 0,

	LNET_UNLINK

} lnet_unlink_t;

};



/**

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

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

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ lnet_md_validate(struct lnet_md *umd) 
 */

int

LNetMDAttach(struct lnet_handle_me meh, struct lnet_md umd,

	     lnet_unlink_t unlink, struct lnet_handle_md *handle)

	     enum lnet_unlink unlink, struct lnet_handle_md *handle)

{

	LIST_HEAD(matches);

	LIST_HEAD(drops);
@@ -350,7 +350,7 @@ EXPORT_SYMBOL(LNetMDAttach); 
 * LNetInvalidateHandle() on it.

 */

int

LNetMDBind(struct lnet_md umd, lnet_unlink_t unlink,

LNetMDBind(struct lnet_md umd, enum lnet_unlink unlink,

	   struct lnet_handle_md *handle)

{

	struct lnet_libmd *md;

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,

	     lnet_unlink_t unlink, lnet_ins_pos_t pos,

	     enum lnet_unlink unlink, lnet_ins_pos_t 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,

	     lnet_unlink_t unlink, lnet_ins_pos_t pos,

	     enum lnet_unlink unlink, lnet_ins_pos_t pos,

	     struct lnet_handle_me *handle)

{

	struct lnet_me *current_me;