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

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

staging: lustre: lnet: change lnet_process_id_packed_t to proper structure 



Change lnet_process_id_packed_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 581c38f3

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

+2 −2
Original line number Diff line number Diff line
@@ -115,11 +115,11 @@ static inline __u32 LNET_MKNET(__u32 type, __u32 num) 
#define WIRE_ATTR	__packed



/* Packed version of lnet_process_id_t to transfer via network */

typedef struct {

struct lnet_process_id_packed {

	/* node id / process id */

	lnet_nid_t	nid;

	lnet_pid_t	pid;

} WIRE_ATTR lnet_process_id_packed_t;

} WIRE_ATTR;



/*

 * The wire handle's interface cookie only matches one network interface in

drivers/staging/lustre/lnet/selftest/conrpc.c

+5 −5
Original line number Diff line number Diff line
@@ -698,17 +698,17 @@ lstcon_statrpc_prep(struct lstcon_node *nd, unsigned int feats, 
	return 0;

}



static lnet_process_id_packed_t *

static struct lnet_process_id_packed *

lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov)

{

	lnet_process_id_packed_t *pid;

	struct lnet_process_id_packed *pid;

	int i;



	i = idx / SFW_ID_PER_PAGE;



	LASSERT(i < nkiov);



	pid = (lnet_process_id_packed_t *)page_address(kiov[i].bv_page);

	pid = (struct lnet_process_id_packed *)page_address(kiov[i].bv_page);



	return &pid[idx % SFW_ID_PER_PAGE];

}
@@ -717,7 +717,7 @@ static int 
lstcon_dstnodes_prep(struct lstcon_group *grp, int idx,

		     int dist, int span, int nkiov, lnet_kiov_t *kiov)

{

	lnet_process_id_packed_t *pid;

	struct lnet_process_id_packed *pid;

	struct lstcon_ndlink *ndl;

	struct lstcon_node *nd;

	int start;
@@ -823,7 +823,7 @@ lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned int feats, 
		npg = sfw_id_pages(test->tes_span);

		nob = !(feats & LST_FEAT_BULK_LEN) ?

		      npg * PAGE_SIZE :

		      sizeof(lnet_process_id_packed_t) * test->tes_span;

		      sizeof(struct lnet_process_id_packed) * test->tes_span;

	}



	rc = lstcon_rpc_prep(nd, SRPC_SERVICE_TEST, feats, npg, nob, crpc);

drivers/staging/lustre/lnet/selftest/framework.c

+4 −4
Original line number Diff line number Diff line
@@ -777,14 +777,14 @@ sfw_add_test_instance(struct sfw_batch *tsb, struct srpc_server_rpc *rpc) 
	LASSERT(bk);

	LASSERT(bk->bk_niov * SFW_ID_PER_PAGE >= (unsigned int)ndest);

	LASSERT((unsigned int)bk->bk_len >=

		sizeof(lnet_process_id_packed_t) * ndest);

		sizeof(struct lnet_process_id_packed) * ndest);



	sfw_unpack_addtest_req(msg);

	memcpy(&tsi->tsi_u, &req->tsr_u, sizeof(tsi->tsi_u));



	for (i = 0; i < ndest; i++) {

		lnet_process_id_packed_t *dests;

		lnet_process_id_packed_t id;

		struct lnet_process_id_packed *dests;

		struct lnet_process_id_packed id;

		int j;



		dests = page_address(bk->bk_iovs[i / SFW_ID_PER_PAGE].bv_page);
@@ -1164,7 +1164,7 @@ sfw_add_test(struct srpc_server_rpc *rpc) 
			len = npg * PAGE_SIZE;



		} else {

			len = sizeof(lnet_process_id_packed_t) *

			len = sizeof(struct lnet_process_id_packed) *

			      request->tsr_ndest;

		}

drivers/staging/lustre/lnet/selftest/selftest.h

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ struct sfw_test_instance { 
 * pages are not used

 */

#define SFW_MAX_CONCUR	   LST_MAX_CONCUR

#define SFW_ID_PER_PAGE    (PAGE_SIZE / sizeof(lnet_process_id_packed_t))

#define SFW_ID_PER_PAGE    (PAGE_SIZE / sizeof(struct lnet_process_id_packed))

#define SFW_MAX_NDESTS	   (LNET_MAX_IOV * SFW_ID_PER_PAGE)

#define sfw_id_pages(n)    (((n) + SFW_ID_PER_PAGE - 1) / SFW_ID_PER_PAGE)