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-1302 llog: structures changes, llog_thread_info
[fs/lustre-release.git]
/
lustre
/
obdclass
/
class_obd.c
diff --git
a/lustre/obdclass/class_obd.c
b/lustre/obdclass/class_obd.c
index
6689678
..
1e935f4
100644
(file)
--- a/
lustre/obdclass/class_obd.c
+++ b/
lustre/obdclass/class_obd.c
@@
-82,6
+82,10
@@
unsigned int obd_timeout = OBD_TIMEOUT_DEFAULT; /* seconds */
EXPORT_SYMBOL(obd_timeout);
unsigned int ldlm_timeout = LDLM_TIMEOUT_DEFAULT; /* seconds */
EXPORT_SYMBOL(ldlm_timeout);
EXPORT_SYMBOL(obd_timeout);
unsigned int ldlm_timeout = LDLM_TIMEOUT_DEFAULT; /* seconds */
EXPORT_SYMBOL(ldlm_timeout);
+unsigned int obd_timeout_set;
+EXPORT_SYMBOL(obd_timeout_set);
+unsigned int ldlm_timeout_set;
+EXPORT_SYMBOL(ldlm_timeout_set);
/* Adaptive timeout defs here instead of ptlrpc module for /proc/sys/ access */
unsigned int at_min = 0;
EXPORT_SYMBOL(at_min);
/* Adaptive timeout defs here instead of ptlrpc module for /proc/sys/ access */
unsigned int at_min = 0;
EXPORT_SYMBOL(at_min);
@@
-562,6
+566,10
@@
int init_obdclass(void)
if (err)
return err;
if (err)
return err;
+ err = llog_info_init();
+ if (err)
+ return err;
+
#ifdef __KERNEL__
err = lustre_register_fs();
#endif
#ifdef __KERNEL__
err = lustre_register_fs();
#endif
@@
-592,6
+600,7
@@
static void cleanup_obdclass(void)
OBP(obd, detach)(obd);
}
}
OBP(obd, detach)(obd);
}
}
+ llog_info_fini();
lu_global_fini();
obd_cleanup_caches();
lu_global_fini();
obd_cleanup_caches();