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

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

staging: lustre: lnet: change lnet_md_t to proper structure 



Change lnet_md_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 d9331056

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

+2 −2
Original line number Diff line number Diff line
@@ -125,11 +125,11 @@ int LNetMEUnlink(struct lnet_handle_me current_in); 
 * @{

 */

int LNetMDAttach(struct lnet_handle_me current_in,

		 lnet_md_t	   md_in,

		 struct lnet_md md_in,

		 lnet_unlink_t     unlink_in,

		 struct lnet_handle_md *md_handle_out);



int LNetMDBind(lnet_md_t	   md_in,

int LNetMDBind(struct lnet_md 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
@@ -194,7 +194,7 @@ lnet_eq_free(struct lnet_eq *eq) 
}



static inline struct lnet_libmd *

lnet_md_alloc(lnet_md_t *umd)

lnet_md_alloc(struct lnet_md *umd)

{

	struct lnet_libmd *md;

	unsigned int size;
@@ -626,7 +626,7 @@ void lnet_copy_kiov2iter(struct iov_iter *to, 
void lnet_me_unlink(struct lnet_me *me);



void lnet_md_unlink(struct lnet_libmd *md);

void lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd);

void lnet_md_deconstruct(struct lnet_libmd *lmd, struct lnet_md *umd);



void lnet_register_lnd(struct lnet_lnd *lnd);

void lnet_unregister_lnd(struct lnet_lnd *lnd);

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

+15 −15
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ typedef enum { 
 * Defines the visible parts of a memory descriptor. Values of this type

 * are used to initialize memory descriptors.

 */

typedef struct {

struct lnet_md {

	/**

	 * Specify the memory region associated with the memory descriptor.

	 * If the options field has:
@@ -471,7 +471,7 @@ typedef struct { 
	 * descriptor are not logged.

	 */

	struct lnet_handle_eq eq_handle;

} lnet_md_t;

};



/*

 * Max Transfer Unit (minimum supported everywhere).
@@ -485,29 +485,29 @@ typedef struct { 
#define LNET_MAX_IOV	256



/**

 * Options for the MD structure. See lnet_md_t::options.

 * Options for the MD structure. See lnet_md::options.

 */

#define LNET_MD_OP_PUT		(1 << 0)

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_OP_GET		(1 << 1)

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_MANAGE_REMOTE	(1 << 2)

/* unused			(1 << 3) */

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_TRUNCATE	(1 << 4)

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_ACK_DISABLE	(1 << 5)

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_IOVEC		(1 << 6)

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_MAX_SIZE	(1 << 7)

/** See lnet_md_t::options. */

/** See lnet_md::options. */

#define LNET_MD_KIOV		(1 << 8)



/* For compatibility with Cray Portals */

#define LNET_MD_PHYS		0



/** Infinite threshold on MD operations. See lnet_md_t::threshold */

/** Infinite threshold on MD operations. See lnet_md::threshold */

#define LNET_MD_THRESH_INF	(-1)



/* NB lustre portals uses struct iovec internally! */
@@ -591,7 +591,7 @@ typedef struct { 
	 * The length (in bytes) of the data that was manipulated by the

	 * operation. For truncated operations, the manipulated length will be

	 * the number of bytes specified by the MD (possibly with an offset,

	 * see lnet_md_t). For all other operations, the manipulated length

	 * see lnet_md). For all other operations, the manipulated length

	 * will be the length of the requested operation, i.e. rlength.

	 */

	unsigned int		mlength;
@@ -605,7 +605,7 @@ typedef struct { 
	 * been processed. In particular, the threshold field in md will

	 * reflect the value of the threshold after the operation occurred.

	 */

	lnet_md_t		md;

	struct lnet_md		md;

	/**

	 * 64 bits of out-of-band user data. Only valid for LNET_EVENT_PUT.

	 * \see LNetPut
@@ -627,7 +627,7 @@ typedef struct { 
	 * The displacement (in bytes) into the memory region that the

	 * operation used. The offset can be determined by the operation for

	 * a remote managed MD or by the local MD.

	 * \see lnet_md_t::options

	 * \see lnet_md::options

	 */

	unsigned int		offset;

	/**
@@ -660,7 +660,7 @@ typedef void (*lnet_eq_handler_t)(lnet_event_t *event); 
 * operation completes (i.e., when the data has been written to a MD of the

 * target process).

 *

 * \see lnet_md_t::options for the discussion on LNET_MD_ACK_DISABLE by which

 * \see lnet_md::options for the discussion on LNET_MD_ACK_DISABLE by which

 * acknowledgments can be disabled for a MD.

 */

typedef enum {

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

+2 −2
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ lnet_ping_info_setup(struct lnet_ping_info **ppinfo, 
{

	lnet_process_id_t id = {LNET_NID_ANY, LNET_PID_ANY};

	struct lnet_handle_me me_handle;

	lnet_md_t md = { NULL };

	struct lnet_md md = { NULL };

	int rc, rc2;



	if (set_eq) {
@@ -2134,7 +2134,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;

	lnet_md_t md = { NULL };

	struct lnet_md md = { NULL };

	int which;

	int unlinked = 0;

	int replied = 0;

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

+5 −5
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ lnet_md_unlink(struct lnet_libmd *md) 
}



static int

lnet_md_build(struct lnet_libmd *lmd, lnet_md_t *umd, int unlink)

lnet_md_build(struct lnet_libmd *lmd, struct lnet_md *umd, int unlink)

{

	int i;

	unsigned int niov;
@@ -204,7 +204,7 @@ lnet_md_link(struct lnet_libmd *md, struct lnet_handle_eq eq_handle, int cpt) 


/* must be called with lnet_res_lock held */

void

lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd)

lnet_md_deconstruct(struct lnet_libmd *lmd, struct lnet_md *umd)

{

	/* NB this doesn't copy out all the iov entries so when a

	 * discontiguous MD is copied out, the target gets to know the
@@ -223,7 +223,7 @@ lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd) 
}



static int

lnet_md_validate(lnet_md_t *umd)

lnet_md_validate(struct lnet_md *umd)

{

	if (!umd->start && umd->length) {

		CERROR("MD start pointer can not be NULL with length %u\n",
@@ -267,7 +267,7 @@ lnet_md_validate(lnet_md_t *umd) 
 * a MD.

 */

int

LNetMDAttach(struct lnet_handle_me meh, lnet_md_t umd,

LNetMDAttach(struct lnet_handle_me meh, struct lnet_md umd,

	     lnet_unlink_t unlink, struct lnet_handle_md *handle)

{

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

 */

int

LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink,

LNetMDBind(struct lnet_md umd, lnet_unlink_t unlink,

	   struct lnet_handle_md *handle)

{

	struct lnet_libmd *md;