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: James 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: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h
index 405bbc6d4785a899a40556e3aa8dc4329614cb01..3c3b667625219dc58f276e93af5ab66461cb7816 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@@ -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

diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c
index 3d325ea7908c420bf2bc189cc49c4ba8024097cb..c6a683bda75eb98139f6d8b23e5cb76ee710771c 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -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);

diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index 436aef37c5008a39b9e0796a463ed78d5da6d747..9dd4e1a70329ea096e6a5ec36e0d94fa16c89397 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -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;
                }
 

diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
index 1e5526c8a20ff927c321493b5b3aa801f563f924..f25948087ee098af4ae3d4367480956759ea2338 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -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)