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-10698 obdclass: allow specifying complex jobids
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_osc.h
diff --git
a/lustre/include/lustre_osc.h
b/lustre/include/lustre_osc.h
index
331e02f
..
ebc0168
100644
(file)
--- a/
lustre/include/lustre_osc.h
+++ b/
lustre/include/lustre_osc.h
@@
-120,7
+120,7
@@
struct osc_device {
} od_stats;
/* configuration item(s) */
} od_stats;
/* configuration item(s) */
-
int
od_contention_time;
+
time64_t
od_contention_time;
int od_lockless_truncate;
};
int od_lockless_truncate;
};
@@
-256,7
+256,7
@@
struct osc_object {
* True if locking against this stripe got -EUSERS.
*/
int oo_contended;
* True if locking against this stripe got -EUSERS.
*/
int oo_contended;
-
cfs_time_t
oo_contention_time;
+
ktime_t
oo_contention_time;
#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
/**
* IO context used for invariant checks in osc_lock_has_pages().
#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
/**
* IO context used for invariant checks in osc_lock_has_pages().
@@
-358,7
+358,7
@@
static inline int osc_object_is_locked(struct osc_object *obj)
static inline void osc_object_set_contended(struct osc_object *obj)
{
static inline void osc_object_set_contended(struct osc_object *obj)
{
- obj->oo_contention_time =
cfs_time_curren
t();
+ obj->oo_contention_time =
ktime_ge
t();
/* mb(); */
obj->oo_contended = 1;
}
/* mb(); */
obj->oo_contended = 1;
}
@@
-533,7
+533,11
@@
struct osc_page {
/**
* Set if the page must be transferred with OBD_BRW_SRVLOCK.
*/
/**
* Set if the page must be transferred with OBD_BRW_SRVLOCK.
*/
- ops_srvlock:1;
+ ops_srvlock:1,
+ /**
+ * If the page is in osc_object::oo_tree.
+ */
+ ops_intree:1;
/**
* lru page list. See osc_lru_{del|use}() in osc_page.c for usage.
*/
/**
* lru page list. See osc_lru_{del|use}() in osc_page.c for usage.
*/
@@
-541,7
+545,7
@@
struct osc_page {
/**
* Submit time - the time when the page is starting RPC. For debugging.
*/
/**
* Submit time - the time when the page is starting RPC. For debugging.
*/
-
cfs_time_t
ops_submit_time;
+
ktime_t
ops_submit_time;
};
struct osc_brw_async_args {
};
struct osc_brw_async_args {