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
Branch HEAD
[fs/lustre-release.git]
/
lnet
/
selftest
/
console.c
diff --git
a/lnet/selftest/console.c
b/lnet/selftest/console.c
index
f474c0b
..
87ef348
100644
(file)
--- a/
lnet/selftest/console.c
+++ b/
lnet/selftest/console.c
@@
-1204,7
+1204,7
@@
again:
int
lstcon_test_add(char *name, int type, int loop, int concur,
int dist, int span, char *src_name, char * dst_name,
int
lstcon_test_add(char *name, int type, int loop, int concur,
int dist, int span, char *src_name, char * dst_name,
- void *param, int paramlen, struct list_head *result_up)
+ void *param, int paramlen,
int *retp,
struct list_head *result_up)
{
lstcon_group_t *src_grp = NULL;
{
lstcon_group_t *src_grp = NULL;
@@
-1236,6
+1236,9
@@
lstcon_test_add(char *name, int type, int loop, int concur,
goto out;
}
goto out;
}
+ if (dst_grp->grp_userland)
+ *retp = 1;
+
LIBCFS_ALLOC(test, offsetof(lstcon_test_t, tes_param[paramlen]));
if (!test) {
CERROR("Can't allocate test descriptor\n");
LIBCFS_ALLOC(test, offsetof(lstcon_test_t, tes_param[paramlen]));
if (!test) {
CERROR("Can't allocate test descriptor\n");
@@
-1849,6
+1852,9
@@
lstcon_acceptor_handle (srpc_server_rpc_t *rpc)
ndl->ndl_node->nd_state = LST_NODE_ACTIVE;
ndl->ndl_node->nd_timeout = console_session.ses_timeout;
ndl->ndl_node->nd_state = LST_NODE_ACTIVE;
ndl->ndl_node->nd_timeout = console_session.ses_timeout;
+ if (grp->grp_userland == 0)
+ grp->grp_userland = 1;
+
strcpy(jrep->join_session, console_session.ses_name);
jrep->join_timeout = console_session.ses_timeout;
jrep->join_status = 0;
strcpy(jrep->join_session, console_session.ses_name);
jrep->join_timeout = console_session.ses_timeout;
jrep->join_status = 0;