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

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

staging: lustre: lnet: change lnet_ni_status_t to proper structure 



Change lnet_ni_status_t from typedef to proper structure.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/24566


Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3236dd36

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

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ typedef struct lnet_ni { 
	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 */

	lnet_ni_status_t	 *ni_status;	/* my health status */

	struct lnet_ni_status	 *ni_status;	/* my health status */

	/* per NI LND tunables */

	struct lnet_ioctl_config_lnd_tunables *ni_lnd_tunables;

	/* equivalent interfaces to use */

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

+3 −3
Original line number Diff line number Diff line
@@ -236,18 +236,18 @@ typedef struct { 


#define LNET_PROTO_ACCEPTOR_VERSION	1



typedef struct {

struct lnet_ni_status {

	lnet_nid_t	ns_nid;

	__u32		ns_status;

	__u32		ns_unused;

} WIRE_ATTR lnet_ni_status_t;

} WIRE_ATTR;



struct lnet_ping_info {

	__u32			pi_magic;

	__u32			pi_features;

	lnet_pid_t		pi_pid;

	__u32			pi_nnis;

	lnet_ni_status_t	pi_ni[0];

	struct lnet_ni_status	pi_ni[0];

} WIRE_ATTR;



typedef struct lnet_counters {

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

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ lnet_ping_md_unlink(struct lnet_ping_info *pinfo, lnet_handle_md_t *md_handle) 
static void

lnet_ping_info_install_locked(struct lnet_ping_info *ping_info)

{

	lnet_ni_status_t *ns;

	struct lnet_ni_status *ns;

	lnet_ni_t *ni;

	int i = 0;

drivers/staging/lustre/lnet/lnet/router.c

+2 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ void 
lnet_swap_pinginfo(struct lnet_ping_info *info)

{

	int i;

	lnet_ni_status_t *stat;

	struct lnet_ni_status *stat;



	__swab32s(&info->pi_magic);

	__swab32s(&info->pi_features);
@@ -683,7 +683,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) 
		}



		for (i = 0; i < info->pi_nnis && i < LNET_MAX_RTR_NIS; i++) {

			lnet_ni_status_t *stat = &info->pi_ni[i];

			struct lnet_ni_status *stat = &info->pi_ni[i];

			lnet_nid_t nid = stat->ns_nid;



			if (nid == LNET_NID_ANY) {