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-3963 obdclass: convert to linux list api
[fs/lustre-release.git]
/
lustre
/
obdclass
/
lu_ref.c
diff --git
a/lustre/obdclass/lu_ref.c
b/lustre/obdclass/lu_ref.c
index
1541949
..
94ad740
100644
(file)
--- a/
lustre/obdclass/lu_ref.c
+++ b/
lustre/obdclass/lu_ref.c
@@
-89,12
+89,12
@@
static struct lu_kmem_descr lu_ref_caches[] = {
*
* Protected by lu_ref_refs_guard.
*/
*
* Protected by lu_ref_refs_guard.
*/
-static
CFS_LIST_HEAD(lu_ref_refs)
;
+static
struct list_head lu_ref_refs
;
static spinlock_t lu_ref_refs_guard;
static struct lu_ref lu_ref_marker = {
.lf_guard = __SPIN_LOCK_UNLOCKED(lu_ref_marker.lf_guard),
static spinlock_t lu_ref_refs_guard;
static struct lu_ref lu_ref_marker = {
.lf_guard = __SPIN_LOCK_UNLOCKED(lu_ref_marker.lf_guard),
- .lf_list =
CFS_
LIST_HEAD_INIT(lu_ref_marker.lf_list),
- .lf_linkage =
CFS_
LIST_HEAD_INIT(lu_ref_marker.lf_linkage)
+ .lf_list = LIST_HEAD_INIT(lu_ref_marker.lf_list),
+ .lf_linkage = LIST_HEAD_INIT(lu_ref_marker.lf_linkage)
};
void lu_ref_print(const struct lu_ref *ref)
};
void lu_ref_print(const struct lu_ref *ref)
@@
-103,7
+103,7
@@
void lu_ref_print(const struct lu_ref *ref)
CERROR("lu_ref: %p %d %d %s:%d\n",
ref, ref->lf_refs, ref->lf_failed, ref->lf_func, ref->lf_line);
CERROR("lu_ref: %p %d %d %s:%d\n",
ref, ref->lf_refs, ref->lf_failed, ref->lf_func, ref->lf_line);
-
cfs_
list_for_each_entry(link, &ref->lf_list, ll_linkage) {
+ list_for_each_entry(link, &ref->lf_list, ll_linkage) {
CERROR(" link: %s %p\n", link->ll_scope, link->ll_source);
}
}
CERROR(" link: %s %p\n", link->ll_scope, link->ll_source);
}
}
@@
-119,7
+119,7
@@
void lu_ref_print_all(void)
struct lu_ref *ref;
spin_lock(&lu_ref_refs_guard);
struct lu_ref *ref;
spin_lock(&lu_ref_refs_guard);
-
cfs_
list_for_each_entry(ref, &lu_ref_refs, lf_linkage) {
+ list_for_each_entry(ref, &lu_ref_refs, lf_linkage) {
if (lu_ref_is_marker(ref))
continue;
if (lu_ref_is_marker(ref))
continue;
@@
-137,19
+137,19
@@
void lu_ref_init_loc(struct lu_ref *ref, const char *func, const int line)
ref->lf_func = func;
ref->lf_line = line;
spin_lock_init(&ref->lf_guard);
ref->lf_func = func;
ref->lf_line = line;
spin_lock_init(&ref->lf_guard);
-
CFS_
INIT_LIST_HEAD(&ref->lf_list);
+ INIT_LIST_HEAD(&ref->lf_list);
spin_lock(&lu_ref_refs_guard);
spin_lock(&lu_ref_refs_guard);
-
cfs_
list_add(&ref->lf_linkage, &lu_ref_refs);
+ list_add(&ref->lf_linkage, &lu_ref_refs);
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_init_loc);
void lu_ref_fini(struct lu_ref *ref)
{
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_init_loc);
void lu_ref_fini(struct lu_ref *ref)
{
- REFASSERT(ref,
cfs_
list_empty(&ref->lf_list));
+ REFASSERT(ref, list_empty(&ref->lf_list));
REFASSERT(ref, ref->lf_refs == 0);
spin_lock(&lu_ref_refs_guard);
REFASSERT(ref, ref->lf_refs == 0);
spin_lock(&lu_ref_refs_guard);
-
cfs_
list_del_init(&ref->lf_linkage);
+ list_del_init(&ref->lf_linkage);
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_fini);
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_fini);
@@
-169,7
+169,7
@@
static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref,
link->ll_scope = scope;
link->ll_source = source;
spin_lock(&ref->lf_guard);
link->ll_scope = scope;
link->ll_source = source;
spin_lock(&ref->lf_guard);
-
cfs_
list_add_tail(&link->ll_linkage, &ref->lf_list);
+ list_add_tail(&link->ll_linkage, &ref->lf_list);
ref->lf_refs++;
spin_unlock(&ref->lf_guard);
}
ref->lf_refs++;
spin_unlock(&ref->lf_guard);
}
@@
-199,7
+199,7
@@
void lu_ref_add_at(struct lu_ref *ref, struct lu_ref_link *link,
link->ll_scope = scope;
link->ll_source = source;
spin_lock(&ref->lf_guard);
link->ll_scope = scope;
link->ll_source = source;
spin_lock(&ref->lf_guard);
-
cfs_
list_add_tail(&link->ll_linkage, &ref->lf_list);
+ list_add_tail(&link->ll_linkage, &ref->lf_list);
ref->lf_refs++;
spin_unlock(&ref->lf_guard);
}
ref->lf_refs++;
spin_unlock(&ref->lf_guard);
}
@@
-236,7
+236,7
@@
static struct lu_ref_link *lu_ref_find(struct lu_ref *ref, const char *scope,
unsigned iterations;
iterations = 0;
unsigned iterations;
iterations = 0;
-
cfs_
list_for_each_entry(link, &ref->lf_list, ll_linkage) {
+ list_for_each_entry(link, &ref->lf_list, ll_linkage) {
++iterations;
if (lu_ref_link_eq(link, scope, source)) {
if (iterations > lu_ref_chain_max_length) {
++iterations;
if (lu_ref_link_eq(link, scope, source)) {
if (iterations > lu_ref_chain_max_length) {
@@
-257,7
+257,7
@@
void lu_ref_del(struct lu_ref *ref, const char *scope, const void *source)
spin_lock(&ref->lf_guard);
link = lu_ref_find(ref, scope, source);
if (link != NULL) {
spin_lock(&ref->lf_guard);
link = lu_ref_find(ref, scope, source);
if (link != NULL) {
-
cfs_
list_del(&link->ll_linkage);
+ list_del(&link->ll_linkage);
ref->lf_refs--;
spin_unlock(&ref->lf_guard);
OBD_SLAB_FREE(link, lu_ref_link_kmem, sizeof(*link));
ref->lf_refs--;
spin_unlock(&ref->lf_guard);
OBD_SLAB_FREE(link, lu_ref_link_kmem, sizeof(*link));
@@
-290,7
+290,7
@@
void lu_ref_del_at(struct lu_ref *ref, struct lu_ref_link *link,
spin_lock(&ref->lf_guard);
REFASSERT(ref, link->ll_ref == ref);
REFASSERT(ref, lu_ref_link_eq(link, scope, source));
spin_lock(&ref->lf_guard);
REFASSERT(ref, link->ll_ref == ref);
REFASSERT(ref, lu_ref_link_eq(link, scope, source));
-
cfs_
list_del(&link->ll_linkage);
+ list_del(&link->ll_linkage);
ref->lf_refs--;
spin_unlock(&ref->lf_guard);
}
ref->lf_refs--;
spin_unlock(&ref->lf_guard);
}
@@
-303,7
+303,7
@@
static void *lu_ref_seq_start(struct seq_file *seq, loff_t *pos)
struct lu_ref *ref = seq->private;
spin_lock(&lu_ref_refs_guard);
struct lu_ref *ref = seq->private;
spin_lock(&lu_ref_refs_guard);
- if (
cfs_
list_empty(&ref->lf_linkage))
+ if (list_empty(&ref->lf_linkage))
ref = NULL;
spin_unlock(&lu_ref_refs_guard);
ref = NULL;
spin_unlock(&lu_ref_refs_guard);
@@
-316,15
+316,15
@@
static void *lu_ref_seq_next(struct seq_file *seq, void *p, loff_t *pos)
struct lu_ref *next;
LASSERT(seq->private == p);
struct lu_ref *next;
LASSERT(seq->private == p);
-
LASSERT(!cfs_
list_empty(&ref->lf_linkage));
+
LASSERT(!
list_empty(&ref->lf_linkage));
spin_lock(&lu_ref_refs_guard);
spin_lock(&lu_ref_refs_guard);
- next =
cfs_
list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
+ next = list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
if (&next->lf_linkage == &lu_ref_refs) {
p = NULL;
} else {
(*pos)++;
if (&next->lf_linkage == &lu_ref_refs) {
p = NULL;
} else {
(*pos)++;
-
cfs_
list_move(&ref->lf_linkage, &next->lf_linkage);
+ list_move(&ref->lf_linkage, &next->lf_linkage);
}
spin_unlock(&lu_ref_refs_guard);
return p;
}
spin_unlock(&lu_ref_refs_guard);
return p;
@@
-342,7
+342,7
@@
static int lu_ref_seq_show(struct seq_file *seq, void *p)
struct lu_ref *next;
spin_lock(&lu_ref_refs_guard);
struct lu_ref *next;
spin_lock(&lu_ref_refs_guard);
- next =
cfs_
list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
+ next = list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
if ((&next->lf_linkage == &lu_ref_refs) || lu_ref_is_marker(next)) {
spin_unlock(&lu_ref_refs_guard);
return 0;
if ((&next->lf_linkage == &lu_ref_refs) || lu_ref_is_marker(next)) {
spin_unlock(&lu_ref_refs_guard);
return 0;
@@
-359,7
+359,7
@@
static int lu_ref_seq_show(struct seq_file *seq, void *p)
struct lu_ref_link *link;
int i = 0;
struct lu_ref_link *link;
int i = 0;
-
cfs_
list_for_each_entry(link, &next->lf_list, ll_linkage)
+ list_for_each_entry(link, &next->lf_list, ll_linkage)
seq_printf(seq, " #%d link: %s %p\n",
i++, link->ll_scope, link->ll_source);
}
seq_printf(seq, " #%d link: %s %p\n",
i++, link->ll_scope, link->ll_source);
}
@@
-384,10
+384,10
@@
static int lu_ref_seq_open(struct inode *inode, struct file *file)
result = seq_open(file, &lu_ref_seq_ops);
if (result == 0) {
spin_lock(&lu_ref_refs_guard);
result = seq_open(file, &lu_ref_seq_ops);
if (result == 0) {
spin_lock(&lu_ref_refs_guard);
- if (!
cfs_
list_empty(&marker->lf_linkage))
+ if (!list_empty(&marker->lf_linkage))
result = -EAGAIN;
else
result = -EAGAIN;
else
-
cfs_
list_add(&marker->lf_linkage, &lu_ref_refs);
+ list_add(&marker->lf_linkage, &lu_ref_refs);
spin_unlock(&lu_ref_refs_guard);
if (result == 0) {
spin_unlock(&lu_ref_refs_guard);
if (result == 0) {
@@
-406,7
+406,7
@@
static int lu_ref_seq_release(struct inode *inode, struct file *file)
struct lu_ref *ref = ((struct seq_file *)file->private_data)->private;
spin_lock(&lu_ref_refs_guard);
struct lu_ref *ref = ((struct seq_file *)file->private_data)->private;
spin_lock(&lu_ref_refs_guard);
-
cfs_
list_del_init(&ref->lf_linkage);
+ list_del_init(&ref->lf_linkage);
spin_unlock(&lu_ref_refs_guard);
return seq_release(inode, file);
spin_unlock(&lu_ref_refs_guard);
return seq_release(inode, file);
@@
-429,6
+429,7
@@
int lu_ref_global_init(void)
CDEBUG(D_CONSOLE,
"lu_ref tracking is enabled. Performance isn't.\n");
CDEBUG(D_CONSOLE,
"lu_ref tracking is enabled. Performance isn't.\n");
+ INIT_LIST_HEAD(&lu_ref_refs);
spin_lock_init(&lu_ref_refs_guard);
result = lu_kmem_init(lu_ref_caches);
spin_lock_init(&lu_ref_refs_guard);
result = lu_kmem_init(lu_ref_caches);