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
i=liangzhen,b=18075:
[fs/lustre-release.git]
/
lnet
/
selftest
/
console.c
diff --git
a/lnet/selftest/console.c
b/lnet/selftest/console.c
index
d8cbabd
..
12a9f05
100644
(file)
--- a/
lnet/selftest/console.c
+++ b/
lnet/selftest/console.c
@@
-1475,9
+1475,7
@@
lstcon_ndlist_stat(struct list_head *ndlist,
return rc;
}
return rc;
}
- timeout = (timeout > LST_TRANS_MIN_TIMEOUT) ? timeout :
- LST_TRANS_MIN_TIMEOUT;
- lstcon_rpc_trans_postwait(trans, timeout);
+ lstcon_rpc_trans_postwait(trans, LST_VALIDATE_TIMEOUT(timeout));
rc = lstcon_rpc_trans_interpreter(trans, result_up,
lstcon_statrpc_readent);
rc = lstcon_rpc_trans_interpreter(trans, result_up,
lstcon_statrpc_readent);
@@
-1564,10
+1562,7
@@
lstcon_debug_ndlist(struct list_head *ndlist,
return rc;
}
return rc;
}
- timeout = (timeout > LST_TRANS_MIN_TIMEOUT) ? timeout :
- LST_TRANS_MIN_TIMEOUT;
-
- lstcon_rpc_trans_postwait(trans, timeout);
+ lstcon_rpc_trans_postwait(trans, LST_VALIDATE_TIMEOUT(timeout));
rc = lstcon_rpc_trans_interpreter(trans, result_up,
lstcon_sesrpc_readent);
rc = lstcon_rpc_trans_interpreter(trans, result_up,
lstcon_sesrpc_readent);
@@
-2000,10
+1995,10
@@
lstcon_console_fini(void)
{
int i;
{
int i;
- mutex_down(&console_session.ses_mutex);
-
libcfs_deregister_ioctl(&lstcon_ioctl_handler);
libcfs_deregister_ioctl(&lstcon_ioctl_handler);
+ mutex_down(&console_session.ses_mutex);
+
srpc_shutdown_service(&lstcon_acceptor_service);
srpc_remove_service(&lstcon_acceptor_service);
srpc_shutdown_service(&lstcon_acceptor_service);
srpc_remove_service(&lstcon_acceptor_service);