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

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

staging: lustre: lnet: change lnd_t to proper structure 



Change lnd_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 f1e0bfb0

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

+3 −3
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ lnet_net2rnethash(__u32 net) 
		((1U << the_lnet.ln_remote_nets_hbits) - 1)];

}



extern lnd_t the_lolnd;

extern struct lnet_lnd the_lolnd;

extern int avoid_asym_router_failure;



int lnet_cpt_of_nid_locked(lnet_nid_t nid);
@@ -628,8 +628,8 @@ 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_register_lnd(lnd_t *lnd);

void lnet_unregister_lnd(lnd_t *lnd);

void lnet_register_lnd(struct lnet_lnd *lnd);

void lnet_unregister_lnd(struct lnet_lnd *lnd);



int lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,

		 __u32 local_ip, __u32 peer_ip, int peer_port);

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

+3 −3
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ struct lnet_test_peer { 


struct lnet_ni;			/* forward ref */



typedef struct lnet_lnd {

struct lnet_lnd {

	/* fields managed by portals */

	struct list_head	lnd_list;	/* stash in the LND table */

	int			lnd_refcount;	/* # active instances */
@@ -243,7 +243,7 @@ typedef struct lnet_lnd { 


	/* accept a new connection */

	int (*lnd_accept)(struct lnet_ni *ni, struct socket *sock);

} lnd_t;

};



struct lnet_tx_queue {

	int			tq_credits;	/* # tx credits free */
@@ -267,7 +267,7 @@ typedef struct lnet_ni { 
	__u32			 *ni_cpts;	/* bond NI on some CPTs */

	lnet_nid_t		  ni_nid;	/* interface's NID */

	void			 *ni_data;	/* instance-specific data */

	lnd_t			 *ni_lnd;	/* procedural interface */

	struct lnet_lnd		 *ni_lnd;	/* procedural interface */

	struct lnet_tx_queue	**ni_tx_queues;	/* percpt TX queues */

	int			**ni_refs;	/* percpt reference count */

	time64_t		  ni_last_alive;/* when I was last alive */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <asm/page.h>

#include "o2iblnd.h"



static lnd_t the_o2iblnd;

static struct lnet_lnd the_o2iblnd;



struct kib_data kiblnd_data;
@@ -2938,7 +2938,7 @@ static int kiblnd_startup(lnet_ni_t *ni) 
	return -ENETDOWN;

}



static lnd_t the_o2iblnd = {

static struct lnet_lnd the_o2iblnd = {

	.lnd_type	= O2IBLND,

	.lnd_startup	= kiblnd_startup,

	.lnd_shutdown	= kiblnd_shutdown,

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#include "socklnd.h"



static lnd_t the_ksocklnd;

static struct lnet_lnd the_ksocklnd;

struct ksock_nal_data ksocknal_data;



static struct ksock_interface *

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

+7 −7
Original line number Diff line number Diff line
@@ -265,15 +265,15 @@ static void lnet_assert_wire_constants(void) 
	BUILD_BUG_ON((int)sizeof(((struct lnet_hdr *)0)->msg.hello.type) != 4);

}



static lnd_t *

static struct lnet_lnd *

lnet_find_lnd_by_type(__u32 type)

{

	lnd_t *lnd;

	struct lnet_lnd *lnd;

	struct list_head *tmp;



	/* holding lnd mutex */

	list_for_each(tmp, &the_lnet.ln_lnds) {

		lnd = list_entry(tmp, lnd_t, lnd_list);

		lnd = list_entry(tmp, struct lnet_lnd, lnd_list);



		if (lnd->lnd_type == type)

			return lnd;
@@ -283,7 +283,7 @@ lnet_find_lnd_by_type(__u32 type) 
}



void

lnet_register_lnd(lnd_t *lnd)

lnet_register_lnd(struct lnet_lnd *lnd)

{

	mutex_lock(&the_lnet.ln_lnd_mutex);
@@ -300,7 +300,7 @@ lnet_register_lnd(lnd_t *lnd) 
EXPORT_SYMBOL(lnet_register_lnd);



void

lnet_unregister_lnd(lnd_t *lnd)

lnet_unregister_lnd(struct lnet_lnd *lnd)

{

	mutex_lock(&the_lnet.ln_lnd_mutex);
@@ -1220,7 +1220,7 @@ lnet_startup_lndni(struct lnet_ni *ni, struct lnet_ioctl_config_data *conf) 
	struct lnet_ioctl_config_lnd_tunables *lnd_tunables = NULL;

	int rc = -EINVAL;

	int lnd_type;

	lnd_t *lnd;

	struct lnet_lnd *lnd;

	struct lnet_tx_queue *tq;

	int i;
@@ -1475,7 +1475,7 @@ void lnet_lib_exit(void) 


	while (!list_empty(&the_lnet.ln_lnds))

		lnet_unregister_lnd(list_entry(the_lnet.ln_lnds.next,

					       lnd_t, lnd_list));

					       struct lnet_lnd, lnd_list));

	lnet_destroy_locks();

}