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
Revert "b=19427 correct lmm_object_id and reserve fids for fid-on-OST."
[fs/lustre-release.git]
/
lustre
/
osc
/
osc_cl_internal.h
diff --git
a/lustre/osc/osc_cl_internal.h
b/lustre/osc/osc_cl_internal.h
index
7f91fb1
..
b8e56eb
100644
(file)
--- a/
lustre/osc/osc_cl_internal.h
+++ b/
lustre/osc/osc_cl_internal.h
@@
-71,10
+71,10
@@
struct osc_io {
int oi_lockless;
struct obdo oi_oa;
int oi_lockless;
struct obdo oi_oa;
- struct osc_
punch
_cbargs {
+ struct osc_
setattr
_cbargs {
int opc_rc;
int opc_rc;
-
struct completion
opc_sync;
- } oi_
punch
_cbarg;
+
cfs_completion_t
opc_sync;
+ } oi_
setattr
_cbarg;
};
/**
};
/**
@@
-114,17
+114,17
@@
struct osc_object {
*/
struct cl_io oo_debug_io;
/** Serialization object for osc_object::oo_debug_io. */
*/
struct cl_io oo_debug_io;
/** Serialization object for osc_object::oo_debug_io. */
-
struct mutex
oo_debug_mutex;
+
cfs_mutex_t
oo_debug_mutex;
#endif
/**
* List of pages in transfer.
*/
#endif
/**
* List of pages in transfer.
*/
-
struct list_head
oo_inflight[CRT_NR];
+
cfs_list_t
oo_inflight[CRT_NR];
/**
* Lock, protecting ccc_object::cob_inflight, because a seat-belt is
* locked during take-off and landing.
*/
/**
* Lock, protecting ccc_object::cob_inflight, because a seat-belt is
* locked during take-off and landing.
*/
-
spinlock_t
oo_seatbelt;
+
cfs_spinlock_t
oo_seatbelt;
};
/*
};
/*
@@
-245,9
+245,11
@@
struct osc_lock {
ols_glimpse:1;
/**
* IO that owns this lock. This field is used for a dead-lock
ols_glimpse:1;
/**
* IO that owns this lock. This field is used for a dead-lock
- * avoidance by osc_lock_enqueue().
+ * avoidance by osc_lock_enqueue
_wait
().
*
*
- * \see osc_deadlock_is_possible()
+ * XXX: unfortunately, the owner of a osc_lock is not unique,
+ * the lock may have multiple users, if the lock is granted and
+ * then matched.
*/
struct osc_io *ols_owner;
};
*/
struct osc_io *ols_owner;
};
@@
-290,7
+292,7
@@
struct osc_page {
* Linkage into a per-osc_object list of pages in flight. For
* debugging.
*/
* Linkage into a per-osc_object list of pages in flight. For
* debugging.
*/
-
struct list_head
ops_inflight;
+
cfs_list_t
ops_inflight;
/**
* Thread that submitted this page for transfer. For debugging.
*/
/**
* Thread that submitted this page for transfer. For debugging.
*/