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-12931 general: fix some cfs_time_seconds() inconsistencies.
[fs/lustre-release.git]
/
lustre
/
mgc
/
mgc_request.c
diff --git
a/lustre/mgc/mgc_request.c
b/lustre/mgc/mgc_request.c
index
40eab2e
..
200720c
100644
(file)
--- a/
lustre/mgc/mgc_request.c
+++ b/
lustre/mgc/mgc_request.c
@@
-2073,7
+2073,7
@@
restart:
atomic_read(&mgc->u.cli.cl_mgc_refcount) > 0 && !retry) {
struct obd_import *imp;
struct l_wait_info lwi;
atomic_read(&mgc->u.cli.cl_mgc_refcount) > 0 && !retry) {
struct obd_import *imp;
struct l_wait_info lwi;
-
int secs
= cfs_time_seconds(obd_timeout);
+
long timeout
= cfs_time_seconds(obd_timeout);
mutex_unlock(&cld->cld_lock);
imp = class_exp2cliimp(mgc->u.cli.cl_mgc_mgsexp);
mutex_unlock(&cld->cld_lock);
imp = class_exp2cliimp(mgc->u.cli.cl_mgc_mgsexp);
@@
-2086,7
+2086,7
@@
restart:
* FULL or closed */
ptlrpc_pinger_force(imp);
* FULL or closed */
ptlrpc_pinger_force(imp);
- lwi = LWI_TIMEOUT(
secs
, NULL, NULL);
+ lwi = LWI_TIMEOUT(
timeout
, NULL, NULL);
l_wait_event(imp->imp_recovery_waitq,
!mgc_import_in_recovery(imp), &lwi);
l_wait_event(imp->imp_recovery_waitq,
!mgc_import_in_recovery(imp), &lwi);