LU-6142 lnet: change lnet selftest UAPI typedefs to proper structure

[fs/lustre-release.git] / lnet / selftest / rpc.h

diff --git a/lnet/selftest/rpc.h b/lnet/selftest/rpc.h
index 697e575..e91386d 100644 (file)
--- a/lnet/selftest/rpc.h
+++ b/lnet/selftest/rpc.h
@@ -75,56 +75,56 @@ typedef struct {
 
 typedef struct {
         __u32                   status;
-        lst_sid_t               sid;
+       struct lst_sid               sid;
 } WIRE_ATTR srpc_generic_reply_t;
 
 /* FRAMEWORK RPCs */
 typedef struct {
         __u64                  mksn_rpyid;      /* reply buffer matchbits */
-        lst_sid_t               mksn_sid;        /* session id */
+       struct lst_sid               mksn_sid;        /* session id */
         __u32                  mksn_force;      /* use brute force */
         char                   mksn_name[LST_NAME_SIZE];
 } WIRE_ATTR srpc_mksn_reqst_t;                         /* make session request */
 
 typedef struct {
         __u32                   mksn_status;      /* session status */
-        lst_sid_t               mksn_sid;         /* session id */
+       struct lst_sid               mksn_sid;         /* session id */
         __u32                   mksn_timeout;     /* session timeout */
         char                   mksn_name[LST_NAME_SIZE];
 } WIRE_ATTR srpc_mksn_reply_t; /* make session reply */
 
 typedef struct {
         __u64                  rmsn_rpyid;      /* reply buffer matchbits */
-        lst_sid_t              rmsn_sid;        /* session id */
+       struct lst_sid          rmsn_sid;        /* session id */
 } WIRE_ATTR srpc_rmsn_reqst_t; /* remove session request */
 
 typedef struct {
         __u32                  rmsn_status;
-        lst_sid_t              rmsn_sid;        /* session id */
+       struct lst_sid          rmsn_sid;        /* session id */
 } WIRE_ATTR srpc_rmsn_reply_t; /* remove session reply */
 
 typedef struct {
         __u64                  join_rpyid;     /* reply buffer matchbits */
-        lst_sid_t               join_sid;       /* session id to join */
+       struct lst_sid               join_sid;       /* session id to join */
         char                    join_group[LST_NAME_SIZE]; /* group name */
 } WIRE_ATTR srpc_join_reqst_t;
 
 typedef struct {
         __u32                   join_status;    /* returned status */
-        lst_sid_t               join_sid;       /* session id */
+       struct lst_sid               join_sid;       /* session id */
         __u32                  join_timeout;   /* # seconds' inactivity to expire */
         char                    join_session[LST_NAME_SIZE]; /* session name */
 } WIRE_ATTR srpc_join_reply_t;
 
 typedef struct {
         __u64                   dbg_rpyid;      /* reply buffer matchbits */ 
-        lst_sid_t               dbg_sid;        /* session id */
+       struct lst_sid               dbg_sid;        /* session id */
         __u32                   dbg_flags;      /* bitmap of debug */
 } WIRE_ATTR srpc_debug_reqst_t;
 
 typedef struct {
         __u32                   dbg_status;     /* returned code */
-        lst_sid_t               dbg_sid;        /* session id */
+       struct lst_sid               dbg_sid;        /* session id */
         __u32                   dbg_timeout;    /* session timeout */
         __u32                   dbg_nbatch;     /* # of batches in the node */
         char                    dbg_name[LST_NAME_SIZE]; /* session name */
@@ -136,8 +136,8 @@ typedef struct {
 
 typedef struct {
         __u64                   bar_rpyid;      /* reply buffer matchbits */ 
-        lst_sid_t               bar_sid;        /* session id */
-        lst_bid_t               bar_bid;        /* batch id */
+       struct lst_sid               bar_sid;        /* session id */
+       struct lst_bid               bar_bid;        /* batch id */
         __u32                   bar_opc;        /* create/start/stop batch */
         __u32                   bar_testidx;    /* index of test */
         __u32                   bar_arg;        /* parameters */
@@ -145,22 +145,22 @@ typedef struct {
 
 typedef struct {
         __u32                   bar_status;     /* status of request */
-        lst_sid_t               bar_sid;        /* session id */
+       struct lst_sid          bar_sid;        /* session id */
         __u32                   bar_active;     /* # of active tests in batch/test */
         __u32                   bar_time;       /* remained time */
 } WIRE_ATTR srpc_batch_reply_t;
 
 typedef struct {
         __u64                   str_rpyid;      /* reply buffer matchbits */
-        lst_sid_t               str_sid;        /* session id */
+       struct lst_sid          str_sid;        /* session id */
         __u32                   str_type;       /* type of stat */
 } WIRE_ATTR srpc_stat_reqst_t;
 
 typedef struct {
         __u32                   str_status;
-        lst_sid_t               str_sid;
-        sfw_counters_t          str_fw;
-        srpc_counters_t         str_rpc;
+       struct lst_sid          str_sid;
+       struct sfw_counters     str_fw;
+       struct srpc_counters    str_rpc;
         lnet_counters_t         str_lnet;
 } WIRE_ATTR srpc_stat_reply_t;
 
@@ -189,8 +189,8 @@ typedef struct {
 typedef struct {
        __u64                   tsr_rpyid;      /* reply buffer matchbits */
        __u64                   tsr_bulkid;     /* bulk buffer matchbits */
-       lst_sid_t               tsr_sid;        /* session id */
-       lst_bid_t               tsr_bid;        /* batch id */
+       struct lst_sid          tsr_sid;        /* session id */
+       struct lst_bid          tsr_bid;        /* batch id */
        __u32                   tsr_service;    /* test type: bulk|ping|... */
        /* test client loop count or # server buffers needed */
        __u32                   tsr_loop;
@@ -208,7 +208,7 @@ typedef struct {
 
 typedef struct {
        __u32                   tsr_status;     /* returned code */
-       lst_sid_t               tsr_sid;
+       struct lst_sid          tsr_sid;
 } WIRE_ATTR srpc_test_reply_t;
 
 /* TEST RPCs */