staging: lustre: lnet: change lnet_rc_data_t to proper structure
Change lnet_rc_data_t from typedef to proper structure. Signed-off-by: James Simmons <uja.ornl@yahoo.com> Reviewed-on: https://review.whamcloud.com/20831 Reviewed-by: Olaf Weber <olaf@sgi.com> Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com> Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
21e86fd388
commit
ff67f7f679
|
@ -297,13 +297,13 @@ struct lnet_ni {
|
||||||
/* router checker data, per router */
|
/* router checker data, per router */
|
||||||
#define LNET_MAX_RTR_NIS 16
|
#define LNET_MAX_RTR_NIS 16
|
||||||
#define LNET_PINGINFO_SIZE offsetof(struct lnet_ping_info, pi_ni[LNET_MAX_RTR_NIS])
|
#define LNET_PINGINFO_SIZE offsetof(struct lnet_ping_info, pi_ni[LNET_MAX_RTR_NIS])
|
||||||
typedef struct {
|
struct lnet_rc_data {
|
||||||
/* chain on the_lnet.ln_zombie_rcd or ln_deathrow_rcd */
|
/* chain on the_lnet.ln_zombie_rcd or ln_deathrow_rcd */
|
||||||
struct list_head rcd_list;
|
struct list_head rcd_list;
|
||||||
struct lnet_handle_md rcd_mdh; /* ping buffer MD */
|
struct lnet_handle_md rcd_mdh; /* ping buffer MD */
|
||||||
struct lnet_peer *rcd_gateway; /* reference to gateway */
|
struct lnet_peer *rcd_gateway; /* reference to gateway */
|
||||||
struct lnet_ping_info *rcd_pinginfo; /* ping buffer */
|
struct lnet_ping_info *rcd_pinginfo; /* ping buffer */
|
||||||
} lnet_rc_data_t;
|
};
|
||||||
|
|
||||||
typedef struct lnet_peer {
|
typedef struct lnet_peer {
|
||||||
struct list_head lp_hashlist; /* chain on peer hash */
|
struct list_head lp_hashlist; /* chain on peer hash */
|
||||||
|
@ -345,7 +345,7 @@ typedef struct lnet_peer {
|
||||||
/* returned RC ping features */
|
/* returned RC ping features */
|
||||||
unsigned int lp_ping_feats;
|
unsigned int lp_ping_feats;
|
||||||
struct list_head lp_routes; /* routers on this peer */
|
struct list_head lp_routes; /* routers on this peer */
|
||||||
lnet_rc_data_t *lp_rcd; /* router checker state */
|
struct lnet_rc_data *lp_rcd; /* router checker state */
|
||||||
} lnet_peer_t;
|
} lnet_peer_t;
|
||||||
|
|
||||||
/* peer hash size */
|
/* peer hash size */
|
||||||
|
|
|
@ -642,7 +642,7 @@ lnet_swap_pinginfo(struct lnet_ping_info *info)
|
||||||
* networks on that router.
|
* networks on that router.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
lnet_parse_rc_info(lnet_rc_data_t *rcd)
|
lnet_parse_rc_info(struct lnet_rc_data *rcd)
|
||||||
{
|
{
|
||||||
struct lnet_ping_info *info = rcd->rcd_pinginfo;
|
struct lnet_ping_info *info = rcd->rcd_pinginfo;
|
||||||
struct lnet_peer *gw = rcd->rcd_gateway;
|
struct lnet_peer *gw = rcd->rcd_gateway;
|
||||||
|
@ -733,7 +733,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd)
|
||||||
static void
|
static void
|
||||||
lnet_router_checker_event(lnet_event_t *event)
|
lnet_router_checker_event(lnet_event_t *event)
|
||||||
{
|
{
|
||||||
lnet_rc_data_t *rcd = event->md.user_ptr;
|
struct lnet_rc_data *rcd = event->md.user_ptr;
|
||||||
struct lnet_peer *lp;
|
struct lnet_peer *lp;
|
||||||
|
|
||||||
LASSERT(rcd);
|
LASSERT(rcd);
|
||||||
|
@ -878,7 +878,7 @@ lnet_update_ni_status_locked(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
lnet_destroy_rc_data(lnet_rc_data_t *rcd)
|
lnet_destroy_rc_data(struct lnet_rc_data *rcd)
|
||||||
{
|
{
|
||||||
LASSERT(list_empty(&rcd->rcd_list));
|
LASSERT(list_empty(&rcd->rcd_list));
|
||||||
/* detached from network */
|
/* detached from network */
|
||||||
|
@ -898,10 +898,10 @@ lnet_destroy_rc_data(lnet_rc_data_t *rcd)
|
||||||
LIBCFS_FREE(rcd, sizeof(*rcd));
|
LIBCFS_FREE(rcd, sizeof(*rcd));
|
||||||
}
|
}
|
||||||
|
|
||||||
static lnet_rc_data_t *
|
static struct lnet_rc_data *
|
||||||
lnet_create_rc_data_locked(lnet_peer_t *gateway)
|
lnet_create_rc_data_locked(lnet_peer_t *gateway)
|
||||||
{
|
{
|
||||||
lnet_rc_data_t *rcd = NULL;
|
struct lnet_rc_data *rcd = NULL;
|
||||||
struct lnet_ping_info *pi;
|
struct lnet_ping_info *pi;
|
||||||
lnet_md_t md;
|
lnet_md_t md;
|
||||||
int rc;
|
int rc;
|
||||||
|
@ -984,7 +984,7 @@ lnet_router_check_interval(lnet_peer_t *rtr)
|
||||||
static void
|
static void
|
||||||
lnet_ping_router_locked(lnet_peer_t *rtr)
|
lnet_ping_router_locked(lnet_peer_t *rtr)
|
||||||
{
|
{
|
||||||
lnet_rc_data_t *rcd = NULL;
|
struct lnet_rc_data *rcd = NULL;
|
||||||
unsigned long now = cfs_time_current();
|
unsigned long now = cfs_time_current();
|
||||||
int secs;
|
int secs;
|
||||||
|
|
||||||
|
@ -1124,8 +1124,8 @@ lnet_router_checker_stop(void)
|
||||||
static void
|
static void
|
||||||
lnet_prune_rc_data(int wait_unlink)
|
lnet_prune_rc_data(int wait_unlink)
|
||||||
{
|
{
|
||||||
lnet_rc_data_t *rcd;
|
struct lnet_rc_data *rcd;
|
||||||
lnet_rc_data_t *tmp;
|
struct lnet_rc_data *tmp;
|
||||||
lnet_peer_t *lp;
|
lnet_peer_t *lp;
|
||||||
struct list_head head;
|
struct list_head head;
|
||||||
int i = 2;
|
int i = 2;
|
||||||
|
@ -1182,7 +1182,7 @@ lnet_prune_rc_data(int wait_unlink)
|
||||||
|
|
||||||
while (!list_empty(&head)) {
|
while (!list_empty(&head)) {
|
||||||
rcd = list_entry(head.next,
|
rcd = list_entry(head.next,
|
||||||
lnet_rc_data_t, rcd_list);
|
struct lnet_rc_data, rcd_list);
|
||||||
list_del_init(&rcd->rcd_list);
|
list_del_init(&rcd->rcd_list);
|
||||||
lnet_destroy_rc_data(rcd);
|
lnet_destroy_rc_data(rcd);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue