Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4423 libcfs: remove IS_PO2 and __is_po2
[fs/lustre-release.git]
/
lnet
/
selftest
/
rpc.h
diff --git
a/lnet/selftest/rpc.h
b/lnet/selftest/rpc.h
index
d9cdca5
..
849aaea
100644
(file)
--- a/
lnet/selftest/rpc.h
+++ b/
lnet/selftest/rpc.h
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,7
+23,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012,
2016,
Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-65,11
+61,6
@@
typedef enum {
SRPC_MSG_JOIN_REPLY = 17,
} srpc_msg_type_t;
SRPC_MSG_JOIN_REPLY = 17,
} srpc_msg_type_t;
-#ifdef __WINNT__
-#include <libcfs/libcfs_pack.h>
-#include <libcfs/libcfs_unpack.h>
-#endif
-
/* CAVEAT EMPTOR:
* All srpc_*_reqst_t's 1st field must be matchbits of reply buffer,
* and 2nd field matchbits of bulk buffer if any.
/* CAVEAT EMPTOR:
* All srpc_*_reqst_t's 1st field must be matchbits of reply buffer,
* and 2nd field matchbits of bulk buffer if any.
@@
-84,56
+75,56
@@
typedef struct {
typedef struct {
__u32 status;
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 */
} 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 */
__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 */
__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;
} 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 */
} 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 */
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 */
__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 */
__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 */
__u32 dbg_timeout; /* session timeout */
__u32 dbg_nbatch; /* # of batches in the node */
char dbg_name[LST_NAME_SIZE]; /* session name */
@@
-145,8
+136,8
@@
typedef struct {
typedef struct {
__u64 bar_rpyid; /* reply buffer matchbits */
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 */
__u32 bar_opc; /* create/start/stop batch */
__u32 bar_testidx; /* index of test */
__u32 bar_arg; /* parameters */
@@
-154,22
+145,22
@@
typedef struct {
typedef struct {
__u32 bar_status; /* status of request */
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 */
__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;
__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;
lnet_counters_t str_lnet;
} WIRE_ATTR srpc_stat_reply_t;
@@
-186,7
+177,7
@@
typedef struct {
__u16 blk_flags;
/** data length */
__u32 blk_len;
__u16 blk_flags;
/** data length */
__u32 blk_len;
- /**
reserved:
offset */
+ /**
bulk
offset */
__u32 blk_offset;
} WIRE_ATTR test_bulk_req_v1_t;
__u32 blk_offset;
} WIRE_ATTR test_bulk_req_v1_t;
@@
-198,8
+189,8
@@
typedef struct {
typedef struct {
__u64 tsr_rpyid; /* reply buffer matchbits */
__u64 tsr_bulkid; /* bulk buffer matchbits */
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;
__u32 tsr_service; /* test type: bulk|ping|... */
/* test client loop count or # server buffers needed */
__u32 tsr_loop;
@@
-217,7
+208,7
@@
typedef struct {
typedef struct {
__u32 tsr_status; /* returned code */
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 */
} WIRE_ATTR srpc_test_reply_t;
/* TEST RPCs */
@@
-226,7
+217,7
@@
typedef struct {
__u32 pnr_magic;
__u32 pnr_seq;
__u64 pnr_time_sec;
__u32 pnr_magic;
__u32 pnr_seq;
__u64 pnr_time_sec;
-
__u64 pnr_time_u
sec;
+
__u64 pnr_time_n
sec;
} WIRE_ATTR srpc_ping_reqst_t;
typedef struct {
} WIRE_ATTR srpc_ping_reqst_t;
typedef struct {