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-8901 misc: update Intel copyright messages for 2016
[fs/lustre-release.git]
/
lnet
/
selftest
/
framework.c
diff --git
a/lnet/selftest/framework.c
b/lnet/selftest/framework.c
index
3b8fe0a
..
506fcd9
100644
(file)
--- a/
lnet/selftest/framework.c
+++ b/
lnet/selftest/framework.c
@@
-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, 201
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-43,15
+39,15
@@
#include "selftest.h"
#include "selftest.h"
-
lst_sid_t
LST_INVALID_SID = {LNET_NID_ANY, -1};
+
struct lst_sid
LST_INVALID_SID = {LNET_NID_ANY, -1};
static int session_timeout = 100;
static int session_timeout = 100;
-CFS_MODULE_PARM(session_timeout, "i", int, 0444,
-
"test session timeout in seconds (100 by default, 0 == never)");
+module_param(session_timeout, int, 0444);
+
MODULE_PARM_DESC(session_timeout,
"test session timeout in seconds (100 by default, 0 == never)");
static int rpc_timeout = 64;
static int rpc_timeout = 64;
-CFS_MODULE_PARM(rpc_timeout, "i", int, 0644,
-
"rpc timeout in seconds (64 by default, 0 == never)");
+module_param(rpc_timeout, int, 0644);
+
MODULE_PARM_DESC(rpc_timeout,
"rpc timeout in seconds (64 by default, 0 == never)");
#define sfw_unpack_id(id) \
do { \
#define sfw_unpack_id(id) \
do { \
@@
-257,7
+253,7
@@
sfw_session_expired (void *data)
LASSERT (sn->sn_timer_active);
LASSERT (sn == sfw_data.fw_session);
LASSERT (sn->sn_timer_active);
LASSERT (sn == sfw_data.fw_session);
-
CWARN ("Session expired! sid: %s-"LPU64"
, name: %s\n",
+
CWARN ("Session expired! sid: %s-%llu
, name: %s\n",
libcfs_nid2str(sn->sn_id.ses_nid),
sn->sn_id.ses_stamp, &sn->sn_name[0]);
libcfs_nid2str(sn->sn_id.ses_nid),
sn->sn_id.ses_stamp, &sn->sn_name[0]);
@@
-268,7
+264,7
@@
sfw_session_expired (void *data)
}
static inline void
}
static inline void
-sfw_init_session(sfw_session_t *sn,
lst_sid_t
sid,
+sfw_init_session(sfw_session_t *sn,
struct lst_sid
sid,
unsigned features, const char *name)
{
stt_timer_t *timer = &sn->sn_timer;
unsigned features, const char *name)
{
stt_timer_t *timer = &sn->sn_timer;
@@
-334,7
+330,7
@@
sfw_client_rpc_fini (srpc_client_rpc_t *rpc)
}
static sfw_batch_t *
}
static sfw_batch_t *
-sfw_find_batch
(lst_bid_t
bid)
+sfw_find_batch
(struct lst_bid
bid)
{
sfw_session_t *sn = sfw_data.fw_session;
sfw_batch_t *bat;
{
sfw_session_t *sn = sfw_data.fw_session;
sfw_batch_t *bat;
@@
-350,7
+346,7
@@
sfw_find_batch (lst_bid_t bid)
}
static sfw_batch_t *
}
static sfw_batch_t *
-sfw_bid2batch
(lst_bid_t
bid)
+sfw_bid2batch
(struct lst_bid
bid)
{
sfw_session_t *sn = sfw_data.fw_session;
sfw_batch_t *bat;
{
sfw_session_t *sn = sfw_data.fw_session;
sfw_batch_t *bat;
@@
-379,7
+375,7
@@
static int
sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply)
{
sfw_session_t *sn = sfw_data.fw_session;
sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply)
{
sfw_session_t *sn = sfw_data.fw_session;
-
sfw_counters_t
*cnt = &reply->str_fw;
+
struct sfw_counters
*cnt = &reply->str_fw;
sfw_batch_t *bat;
struct timeval tv;
sfw_batch_t *bat;
struct timeval tv;
@@
-757,7
+753,7
@@
sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc)
LIBCFS_ALLOC(tsi, sizeof(*tsi));
if (tsi == NULL) {
LIBCFS_ALLOC(tsi, sizeof(*tsi));
if (tsi == NULL) {
-
CERROR ("Can't allocate test instance for batch: "LPU64"
\n",
+
CERROR ("Can't allocate test instance for batch: %llu
\n",
tsb->bat_id.bat_id);
return -ENOMEM;
}
tsb->bat_id.bat_id);
return -ENOMEM;
}
@@
-1017,7
+1013,7
@@
sfw_run_batch (sfw_batch_t *tsb)
sfw_test_instance_t *tsi;
if (sfw_batch_active(tsb)) {
sfw_test_instance_t *tsi;
if (sfw_batch_active(tsb)) {
-
CDEBUG(D_NET, "Batch already active: "LPU64"
(%d)\n",
+
CDEBUG(D_NET, "Batch already active: %llu
(%d)\n",
tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive));
return 0;
}
tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive));
return 0;
}
@@
-1052,7
+1048,7
@@
sfw_stop_batch (sfw_batch_t *tsb, int force)
srpc_client_rpc_t *rpc;
if (!sfw_batch_active(tsb)) {
srpc_client_rpc_t *rpc;
if (!sfw_batch_active(tsb)) {
-
CDEBUG(D_NET, "Batch "LPU64"
inactive\n", tsb->bat_id.bat_id);
+
CDEBUG(D_NET, "Batch %llu
inactive\n", tsb->bat_id.bat_id);
return 0;
}
return 0;
}
@@
-1125,7
+1121,7
@@
sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
LASSERT(rpc->srpc_bulk == NULL);
LASSERT(npages > 0 && npages <= LNET_MAX_IOV);
LASSERT(rpc->srpc_bulk == NULL);
LASSERT(npages > 0 && npages <= LNET_MAX_IOV);
- rpc->srpc_bulk = srpc_alloc_bulk(cpt, npages, len, sink);
+ rpc->srpc_bulk = srpc_alloc_bulk(cpt,
0,
npages, len, sink);
if (rpc->srpc_bulk == NULL)
return -ENOMEM;
if (rpc->srpc_bulk == NULL)
return -ENOMEM;
@@
-1181,7
+1177,7
@@
sfw_add_test (srpc_server_rpc_t *rpc)
int len;
if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) {
int len;
if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) {
- len = npg * PAGE_
CACHE_
SIZE;
+ len = npg * PAGE_SIZE;
} else {
len = sizeof(lnet_process_id_packed_t) *
} else {
len = sizeof(lnet_process_id_packed_t) *