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-220 open: try open_by_fid for the known object
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_import.h
diff --git
a/lustre/include/lustre_import.h
b/lustre/include/lustre_import.h
index
ff66273
..
f32c9ef
100644
(file)
--- a/
lustre/include/lustre_import.h
+++ b/
lustre/include/lustre_import.h
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-190,7
+188,7
@@
struct obd_import {
* @{
*/
struct ptlrpc_sec *imp_sec;
* @{
*/
struct ptlrpc_sec *imp_sec;
- cfs_
semaphore_t
imp_sec_mutex;
+ cfs_
mutex_t
imp_sec_mutex;
cfs_time_t imp_sec_expire;
/** @} */
cfs_time_t imp_sec_expire;
/** @} */
@@
-317,13
+315,16
@@
static inline unsigned int at_timeout2est(unsigned int val)
return (max((val << 2) / 5, 5U) - 4);
}
return (max((val << 2) / 5, 5U) - 4);
}
-static inline void at_init(struct adaptive_timeout *at, int val, int flags) {
- memset(at, 0, sizeof(*at));
+static inline void at_reset(struct adaptive_timeout *at, int val) {
at->at_current = val;
at->at_worst_ever = val;
at->at_worst_time = cfs_time_current_sec();
at->at_current = val;
at->at_worst_ever = val;
at->at_worst_time = cfs_time_current_sec();
- at->at_flags = flags;
- cfs_spin_lock_init(&at->at_lock);
+}
+static inline void at_init(struct adaptive_timeout *at, int val, int flags) {
+ memset(at, 0, sizeof(*at));
+ cfs_spin_lock_init(&at->at_lock);
+ at->at_flags = flags;
+ at_reset(at, val);
}
extern unsigned int at_min;
static inline int at_get(struct adaptive_timeout *at) {
}
extern unsigned int at_min;
static inline int at_get(struct adaptive_timeout *at) {