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
b=23289 remove mc_waitq
[fs/lustre-release.git]
/
lustre
/
lov
/
lovsub_lock.c
diff --git
a/lustre/lov/lovsub_lock.c
b/lustre/lov/lovsub_lock.c
index
663547a
..
f7d54ba
100644
(file)
--- a/
lustre/lov/lovsub_lock.c
+++ b/
lustre/lov/lovsub_lock.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc.
All rights reserved.
+ * Copyright
(c) 2008, 2010, Oracle and/or its affiliates.
All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-59,7
+59,7
@@
static void lovsub_lock_fini(const struct lu_env *env,
ENTRY;
lsl = cl2lovsub_lock(slice);
ENTRY;
lsl = cl2lovsub_lock(slice);
- LASSERT(list_empty(&lsl->lss_parents));
+ LASSERT(
cfs_
list_empty(&lsl->lss_parents));
OBD_SLAB_FREE_PTR(lsl, lovsub_lock_kmem);
EXIT;
}
OBD_SLAB_FREE_PTR(lsl, lovsub_lock_kmem);
EXIT;
}
@@
-103,7
+103,7
@@
static void lovsub_lock_state(const struct lu_env *env,
LASSERT(cl_lock_is_mutexed(slice->cls_lock));
ENTRY;
LASSERT(cl_lock_is_mutexed(slice->cls_lock));
ENTRY;
- list_for_each_entry(scan, &sub->lss_parents, lll_list) {
+
cfs_
list_for_each_entry(scan, &sub->lss_parents, lll_list) {
struct lov_lock *lov = scan->lll_super;
struct cl_lock *parent = lov->lls_cl.cls_lock;
struct lov_lock *lov = scan->lll_super;
struct cl_lock *parent = lov->lls_cl.cls_lock;
@@
-131,7
+131,7
@@
static unsigned long lovsub_lock_weigh(const struct lu_env *env,
LASSERT(cl_lock_is_mutexed(slice->cls_lock));
LASSERT(cl_lock_is_mutexed(slice->cls_lock));
- if (!list_empty(&lock->lss_parents)) {
+ if (!
cfs_
list_empty(&lock->lss_parents)) {
/*
* It is not clear whether all parents have to be asked and
* their estimations summed, or it is enough to ask one. For
/*
* It is not clear whether all parents have to be asked and
* their estimations summed, or it is enough to ask one. For
@@
-248,7
+248,7
@@
static int lovsub_lock_modify(const struct lu_env *env,
LASSERT(cl_lock_mode_match(d->cld_mode,
s->cls_lock->cll_descr.cld_mode));
LASSERT(cl_lock_mode_match(d->cld_mode,
s->cls_lock->cll_descr.cld_mode));
- list_for_each_entry(scan, &lock->lss_parents, lll_list) {
+
cfs_
list_for_each_entry(scan, &lock->lss_parents, lll_list) {
int rc;
lov = scan->lll_super;
int rc;
lov = scan->lll_super;
@@
-275,7
+275,7
@@
static int lovsub_lock_closure(const struct lu_env *env,
sub = cl2lovsub_lock(slice);
result = 0;
sub = cl2lovsub_lock(slice);
result = 0;
- list_for_each_entry(scan, &sub->lss_parents, lll_list) {
+
cfs_
list_for_each_entry(scan, &sub->lss_parents, lll_list) {
parent = scan->lll_super->lls_cl.cls_lock;
result = cl_lock_closure_build(env, parent, closure);
if (result != 0)
parent = scan->lll_super->lls_cl.cls_lock;
result = cl_lock_closure_build(env, parent, closure);
if (result != 0)
@@
-379,7
+379,7
@@
static int lovsub_lock_delete_one(const struct lu_env *env,
case CLS_HELD:
CL_LOCK_DEBUG(D_ERROR, env, parent, "Delete CLS_HELD lock\n");
default:
case CLS_HELD:
CL_LOCK_DEBUG(D_ERROR, env, parent, "Delete CLS_HELD lock\n");
default:
- CERROR("Impossible state: %
i
\n", parent->cll_state);
+ CERROR("Impossible state: %
d
\n", parent->cll_state);
LBUG();
break;
}
LBUG();
break;
}
@@
-416,8
+416,8
@@
static void lovsub_lock_delete(const struct lu_env *env,
struct lov_lock_sub *subdata;
restart = 0;
struct lov_lock_sub *subdata;
restart = 0;
- list_for_each_entry_safe(scan, temp,
- &sub->lss_parents, lll_list) {
+
cfs_
list_for_each_entry_safe(scan, temp,
+
&sub->lss_parents, lll_list) {
lov = scan->lll_super;
subdata = &lov->lls_sub[scan->lll_idx];
lovsub_parent_lock(env, lov);
lov = scan->lll_super;
subdata = &lov->lls_sub[scan->lll_idx];
lovsub_parent_lock(env, lov);
@@
-442,7
+442,7
@@
static int lovsub_lock_print(const struct lu_env *env, void *cookie,
struct lov_lock *lov;
struct lov_lock_link *scan;
struct lov_lock *lov;
struct lov_lock_link *scan;
- list_for_each_entry(scan, &sub->lss_parents, lll_list) {
+
cfs_
list_for_each_entry(scan, &sub->lss_parents, lll_list) {
lov = scan->lll_super;
(*p)(env, cookie, "[%d %p ", scan->lll_idx, lov);
if (lov != NULL)
lov = scan->lll_super;
(*p)(env, cookie, "[%d %p ", scan->lll_idx, lov);
if (lov != NULL)