Commit 5342a337 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: lnet: change lnet_portal_t to proper structure

Change lnet_portal_t from typedef to proper structure.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831Reviewed-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 e99cc0f1
...@@ -502,31 +502,31 @@ void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt); ...@@ -502,31 +502,31 @@ void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt);
/* portals functions */ /* portals functions */
/* portals attributes */ /* portals attributes */
static inline int static inline int
lnet_ptl_is_lazy(lnet_portal_t *ptl) lnet_ptl_is_lazy(struct lnet_portal *ptl)
{ {
return !!(ptl->ptl_options & LNET_PTL_LAZY); return !!(ptl->ptl_options & LNET_PTL_LAZY);
} }
static inline int static inline int
lnet_ptl_is_unique(lnet_portal_t *ptl) lnet_ptl_is_unique(struct lnet_portal *ptl)
{ {
return !!(ptl->ptl_options & LNET_PTL_MATCH_UNIQUE); return !!(ptl->ptl_options & LNET_PTL_MATCH_UNIQUE);
} }
static inline int static inline int
lnet_ptl_is_wildcard(lnet_portal_t *ptl) lnet_ptl_is_wildcard(struct lnet_portal *ptl)
{ {
return !!(ptl->ptl_options & LNET_PTL_MATCH_WILDCARD); return !!(ptl->ptl_options & LNET_PTL_MATCH_WILDCARD);
} }
static inline void static inline void
lnet_ptl_setopt(lnet_portal_t *ptl, int opt) lnet_ptl_setopt(struct lnet_portal *ptl, int opt)
{ {
ptl->ptl_options |= opt; ptl->ptl_options |= opt;
} }
static inline void static inline void
lnet_ptl_unsetopt(lnet_portal_t *ptl, int opt) lnet_ptl_unsetopt(struct lnet_portal *ptl, int opt)
{ {
ptl->ptl_options &= ~opt; ptl->ptl_options &= ~opt;
} }
......
...@@ -438,7 +438,7 @@ enum { ...@@ -438,7 +438,7 @@ enum {
LNET_MATCHMD_FINISH = (LNET_MATCHMD_OK | LNET_MATCHMD_DROP), LNET_MATCHMD_FINISH = (LNET_MATCHMD_OK | LNET_MATCHMD_DROP),
}; };
/* Options for lnet_portal_t::ptl_options */ /* Options for lnet_portal::ptl_options */
#define LNET_PTL_LAZY (1 << 0) #define LNET_PTL_LAZY (1 << 0)
#define LNET_PTL_MATCH_UNIQUE (1 << 1) /* unique match, for RDMA */ #define LNET_PTL_MATCH_UNIQUE (1 << 1) /* unique match, for RDMA */
#define LNET_PTL_MATCH_WILDCARD (1 << 2) /* wildcard match, #define LNET_PTL_MATCH_WILDCARD (1 << 2) /* wildcard match,
...@@ -497,7 +497,7 @@ struct lnet_match_table { ...@@ -497,7 +497,7 @@ struct lnet_match_table {
/* dispatch routed PUT message by hashing source NID for wildcard portals */ /* dispatch routed PUT message by hashing source NID for wildcard portals */
#define LNET_PTL_ROTOR_HASH_RT 3 #define LNET_PTL_ROTOR_HASH_RT 3
typedef struct lnet_portal { struct lnet_portal {
spinlock_t ptl_lock; spinlock_t ptl_lock;
unsigned int ptl_index; /* portal ID, reserved */ unsigned int ptl_index; /* portal ID, reserved */
/* flags on this portal: lazy, unique... */ /* flags on this portal: lazy, unique... */
...@@ -514,7 +514,7 @@ typedef struct lnet_portal { ...@@ -514,7 +514,7 @@ typedef struct lnet_portal {
int ptl_mt_nmaps; int ptl_mt_nmaps;
/* array of active entries' cpu-partition-id */ /* array of active entries' cpu-partition-id */
int ptl_mt_maps[0]; int ptl_mt_maps[0];
} lnet_portal_t; };
#define LNET_LH_HASH_BITS 12 #define LNET_LH_HASH_BITS 12
#define LNET_LH_HASH_SIZE (1ULL << LNET_LH_HASH_BITS) #define LNET_LH_HASH_SIZE (1ULL << LNET_LH_HASH_BITS)
...@@ -557,7 +557,7 @@ typedef struct { ...@@ -557,7 +557,7 @@ typedef struct {
/* # portals */ /* # portals */
int ln_nportals; int ln_nportals;
/* the vector of portals */ /* the vector of portals */
lnet_portal_t **ln_portals; struct lnet_portal **ln_portals;
/* percpt ME containers */ /* percpt ME containers */
struct lnet_res_container **ln_me_containers; struct lnet_res_container **ln_me_containers;
/* percpt MD container */ /* percpt MD container */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment