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
- landing of b_hd_cleanup_merge to HEAD.
[fs/lustre-release.git]
/
lnet
/
tests
/
ping_srv.c
diff --git
a/lnet/tests/ping_srv.c
b/lnet/tests/ping_srv.c
index
188ba98
..
dec806a
100644
(file)
--- a/
lnet/tests/ping_srv.c
+++ b/
lnet/tests/ping_srv.c
@@
-116,12
+116,12
@@
int pingsrv_thread(void *arg)
continue;
}
continue;
}
- magic = *((int *)(server->evnt.m
em_desc
.start
+ magic = *((int *)(server->evnt.m
d
.start
+ server->evnt.offset));
if(magic != 0xdeadbeef) {
+ server->evnt.offset));
if(magic != 0xdeadbeef) {
-
printk("LustreError:
Unexpected Packet to the server\n");
+
CERROR("
Unexpected Packet to the server\n");
}
memcpy (server->in_buf, &ping_bulk_magic, sizeof(ping_bulk_magic));
}
memcpy (server->in_buf, &ping_bulk_magic, sizeof(ping_bulk_magic));
@@
-131,7
+131,7
@@
int pingsrv_thread(void *arg)
server->mdout.threshold = 1;
server->mdout.options = PTL_MD_EVENT_START_DISABLE | PTL_MD_OP_PUT;
server->mdout.user_ptr = NULL;
server->mdout.threshold = 1;
server->mdout.options = PTL_MD_EVENT_START_DISABLE | PTL_MD_OP_PUT;
server->mdout.user_ptr = NULL;
- server->mdout.e
ventq
= PTL_EQ_NONE;
+ server->mdout.e
q_handle
= PTL_EQ_NONE;
/* Bind the outgoing buffer */
if ((rc = PtlMDBind (server->ni, server->mdout,
/* Bind the outgoing buffer */
if ((rc = PtlMDBind (server->ni, server->mdout,
@@
-147,7
+147,7
@@
int pingsrv_thread(void *arg)
server->mdin.threshold = 1;
server->mdin.options = PTL_MD_EVENT_START_DISABLE | PTL_MD_OP_PUT;
server->mdin.user_ptr = NULL;
server->mdin.threshold = 1;
server->mdin.options = PTL_MD_EVENT_START_DISABLE | PTL_MD_OP_PUT;
server->mdin.user_ptr = NULL;
- server->mdin.e
ventq
= server->eq;
+ server->mdin.e
q_handle
= server->eq;
if ((rc = PtlMDAttach (server->me, server->mdin,
PTL_UNLINK, &server->mdin_h))) {
if ((rc = PtlMDAttach (server->me, server->mdin,
PTL_UNLINK, &server->mdin_h))) {
@@
-182,12
+182,12
@@
static void pingsrv_callback(ptl_event_t *ev)
}
server->evnt = *ev;
}
server->evnt = *ev;
-
printk ("Lustre:
received ping from nid "LPX64" "
+
CWARN ("
received ping from nid "LPX64" "
"(off=%u rlen=%u mlen=%u head=%x seq=%d size=%d)\n",
ev->initiator.nid, ev->offset, ev->rlength, ev->mlength,
"(off=%u rlen=%u mlen=%u head=%x seq=%d size=%d)\n",
ev->initiator.nid, ev->offset, ev->rlength, ev->mlength,
- *((int *)(ev->m
em_desc
.start + ev->offset)),
- *((int *)(ev->m
em_desc
.start + ev->offset + sizeof(unsigned))),
- *((int *)(ev->m
em_desc
.start + ev->offset + 2 *
+ *((int *)(ev->m
d
.start + ev->offset)),
+ *((int *)(ev->m
d
.start + ev->offset + sizeof(unsigned))),
+ *((int *)(ev->m
d
.start + ev->offset + 2 *
sizeof(unsigned))));
packets_valid++;
sizeof(unsigned))));
packets_valid++;
@@
-247,7
+247,7
@@
static struct pingsrv_data *pingsrv_setup(void)
server->mdin.threshold = 1;
server->mdin.options = PTL_MD_EVENT_START_DISABLE | PTL_MD_OP_PUT;
server->mdin.user_ptr = NULL;
server->mdin.threshold = 1;
server->mdin.options = PTL_MD_EVENT_START_DISABLE | PTL_MD_OP_PUT;
server->mdin.user_ptr = NULL;
- server->mdin.e
ventq
= server->eq;
+ server->mdin.e
q_handle
= server->eq;
memset (server->in_buf, 0, STDSIZE);
if ((rc = PtlMDAttach (server->me, server->mdin,
memset (server->in_buf, 0, STDSIZE);
if ((rc = PtlMDAttach (server->me, server->mdin,