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-1285 tests: fix tar breakage in 102d/102f/102j
[fs/lustre-release.git]
/
lustre
/
obdclass
/
lu_ref.c
diff --git
a/lustre/obdclass/lu_ref.c
b/lustre/obdclass/lu_ref.c
index
a75a61a
..
aa2c366
100644
(file)
--- a/
lustre/obdclass/lu_ref.c
+++ b/
lustre/obdclass/lu_ref.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.
*/
/*
@@
-68,16
+68,16
@@
\
if (unlikely(!(expr))) { \
lu_ref_print(__ref); \
\
if (unlikely(!(expr))) { \
lu_ref_print(__ref); \
-
spin_unlock(&__ref->lf_guard);
\
+
cfs_spin_unlock(&__ref->lf_guard);
\
lu_ref_print_all(); \
lu_ref_print_all(); \
- spin_lock(&__ref->lf_guard); \
LASSERT(0); \
LASSERT(0); \
+ cfs_spin_lock(&__ref->lf_guard); \
} \
} while (0)
struct lu_ref_link {
struct lu_ref *ll_ref;
} \
} while (0)
struct lu_ref_link {
struct lu_ref *ll_ref;
-
struct list_head
ll_linkage;
+
cfs_list_t
ll_linkage;
const char *ll_scope;
const void *ll_source;
};
const char *ll_scope;
const void *ll_source;
};
@@
-101,9
+101,9
@@
static struct lu_kmem_descr lu_ref_caches[] = {
* Protected by lu_ref_refs_guard.
*/
static CFS_LIST_HEAD(lu_ref_refs);
* Protected by lu_ref_refs_guard.
*/
static CFS_LIST_HEAD(lu_ref_refs);
-static spinlock_t lu_ref_refs_guard;
+static
cfs_
spinlock_t lu_ref_refs_guard;
static struct lu_ref lu_ref_marker = {
static struct lu_ref lu_ref_marker = {
- .lf_guard = SPIN_LOCK_UNLOCKED,
+ .lf_guard =
CFS_
SPIN_LOCK_UNLOCKED,
.lf_list = CFS_LIST_HEAD_INIT(lu_ref_marker.lf_list),
.lf_linkage = CFS_LIST_HEAD_INIT(lu_ref_marker.lf_linkage)
};
.lf_list = CFS_LIST_HEAD_INIT(lu_ref_marker.lf_list),
.lf_linkage = CFS_LIST_HEAD_INIT(lu_ref_marker.lf_linkage)
};
@@
-114,7
+114,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);
- list_for_each_entry(link, &ref->lf_list, ll_linkage) {
+
cfs_
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);
}
}
@@
-129,16
+129,16
@@
void lu_ref_print_all(void)
{
struct lu_ref *ref;
{
struct lu_ref *ref;
- spin_lock(&lu_ref_refs_guard);
- list_for_each_entry(ref, &lu_ref_refs, lf_linkage) {
+
cfs_
spin_lock(&lu_ref_refs_guard);
+
cfs_
list_for_each_entry(ref, &lu_ref_refs, lf_linkage) {
if (lu_ref_is_marker(ref))
continue;
if (lu_ref_is_marker(ref))
continue;
- spin_lock(&ref->lf_guard);
+
cfs_
spin_lock(&ref->lf_guard);
lu_ref_print(ref);
lu_ref_print(ref);
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
}
}
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_print_all);
}
EXPORT_SYMBOL(lu_ref_print_all);
@@
-147,21
+147,21
@@
void lu_ref_init_loc(struct lu_ref *ref, const char *func, const int line)
ref->lf_refs = 0;
ref->lf_func = func;
ref->lf_line = line;
ref->lf_refs = 0;
ref->lf_func = func;
ref->lf_line = line;
- spin_lock_init(&ref->lf_guard);
+
cfs_
spin_lock_init(&ref->lf_guard);
CFS_INIT_LIST_HEAD(&ref->lf_list);
CFS_INIT_LIST_HEAD(&ref->lf_list);
- spin_lock(&lu_ref_refs_guard);
- list_add(&ref->lf_linkage, &lu_ref_refs);
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_lock(&lu_ref_refs_guard);
+
cfs_
list_add(&ref->lf_linkage, &lu_ref_refs);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_init_loc);
void lu_ref_fini(struct lu_ref *ref)
{
}
EXPORT_SYMBOL(lu_ref_init_loc);
void lu_ref_fini(struct lu_ref *ref)
{
- REFASSERT(ref, list_empty(&ref->lf_list));
+ REFASSERT(ref,
cfs_
list_empty(&ref->lf_list));
REFASSERT(ref, ref->lf_refs == 0);
REFASSERT(ref, ref->lf_refs == 0);
- spin_lock(&lu_ref_refs_guard);
- list_del_init(&ref->lf_linkage);
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_lock(&lu_ref_refs_guard);
+
cfs_
list_del_init(&ref->lf_linkage);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
}
EXPORT_SYMBOL(lu_ref_fini);
}
EXPORT_SYMBOL(lu_ref_fini);
@@
-179,17
+179,17
@@
static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref,
link->ll_ref = ref;
link->ll_scope = scope;
link->ll_source = source;
link->ll_ref = ref;
link->ll_scope = scope;
link->ll_source = source;
- spin_lock(&ref->lf_guard);
- list_add_tail(&link->ll_linkage, &ref->lf_list);
+
cfs_
spin_lock(&ref->lf_guard);
+
cfs_
list_add_tail(&link->ll_linkage, &ref->lf_list);
ref->lf_refs++;
ref->lf_refs++;
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
}
}
if (link == NULL) {
}
}
if (link == NULL) {
- spin_lock(&ref->lf_guard);
+
cfs_
spin_lock(&ref->lf_guard);
ref->lf_failed++;
ref->lf_failed++;
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
link = ERR_PTR(-ENOMEM);
}
link = ERR_PTR(-ENOMEM);
}
@@
-199,7
+199,7
@@
static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref,
struct lu_ref_link *lu_ref_add(struct lu_ref *ref, const char *scope,
const void *source)
{
struct lu_ref_link *lu_ref_add(struct lu_ref *ref, const char *scope,
const void *source)
{
- might_sleep();
+
cfs_
might_sleep();
return lu_ref_add_context(ref, CFS_ALLOC_STD, scope, source);
}
EXPORT_SYMBOL(lu_ref_add);
return lu_ref_add_context(ref, CFS_ALLOC_STD, scope, source);
}
EXPORT_SYMBOL(lu_ref_add);
@@
-235,11
+235,11
@@
static struct lu_ref_link *lu_ref_find(struct lu_ref *ref, const char *scope,
unsigned iterations;
iterations = 0;
unsigned iterations;
iterations = 0;
- list_for_each_entry(link, &ref->lf_list, ll_linkage) {
+
cfs_
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) {
- CWARN("Long lu_ref chain %
i
\"%s\":%p\n",
+ CWARN("Long lu_ref chain %
d
\"%s\":%p\n",
iterations, scope, source);
lu_ref_chain_max_length = iterations * 3 / 2;
}
iterations, scope, source);
lu_ref_chain_max_length = iterations * 3 / 2;
}
@@
-253,17
+253,17
@@
void lu_ref_del(struct lu_ref *ref, const char *scope, const void *source)
{
struct lu_ref_link *link;
{
struct lu_ref_link *link;
- spin_lock(&ref->lf_guard);
+
cfs_
spin_lock(&ref->lf_guard);
link = lu_ref_find(ref, scope, source);
if (link != NULL) {
link = lu_ref_find(ref, scope, source);
if (link != NULL) {
- list_del(&link->ll_linkage);
+
cfs_
list_del(&link->ll_linkage);
ref->lf_refs--;
ref->lf_refs--;
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
OBD_SLAB_FREE(link, lu_ref_link_kmem, sizeof(*link));
} else {
REFASSERT(ref, ref->lf_failed > 0);
ref->lf_failed--;
OBD_SLAB_FREE(link, lu_ref_link_kmem, sizeof(*link));
} else {
REFASSERT(ref, ref->lf_failed > 0);
ref->lf_failed--;
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
}
}
EXPORT_SYMBOL(lu_ref_del);
}
}
EXPORT_SYMBOL(lu_ref_del);
@@
-272,7
+272,7
@@
void lu_ref_set_at(struct lu_ref *ref, struct lu_ref_link *link,
const char *scope,
const void *source0, const void *source1)
{
const char *scope,
const void *source0, const void *source1)
{
- spin_lock(&ref->lf_guard);
+
cfs_
spin_lock(&ref->lf_guard);
if (link != ERR_PTR(-ENOMEM)) {
REFASSERT(ref, link->ll_ref == ref);
REFASSERT(ref, lu_ref_link_eq(link, scope, source0));
if (link != ERR_PTR(-ENOMEM)) {
REFASSERT(ref, link->ll_ref == ref);
REFASSERT(ref, lu_ref_link_eq(link, scope, source0));
@@
-280,7
+280,7
@@
void lu_ref_set_at(struct lu_ref *ref, struct lu_ref_link *link,
} else {
REFASSERT(ref, ref->lf_failed > 0);
}
} else {
REFASSERT(ref, ref->lf_failed > 0);
}
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
}
EXPORT_SYMBOL(lu_ref_set_at);
}
EXPORT_SYMBOL(lu_ref_set_at);
@@
-288,18
+288,18
@@
void lu_ref_del_at(struct lu_ref *ref, struct lu_ref_link *link,
const char *scope, const void *source)
{
if (link != ERR_PTR(-ENOMEM)) {
const char *scope, const void *source)
{
if (link != ERR_PTR(-ENOMEM)) {
- spin_lock(&ref->lf_guard);
+
cfs_
spin_lock(&ref->lf_guard);
REFASSERT(ref, link->ll_ref == ref);
REFASSERT(ref, lu_ref_link_eq(link, scope, source));
REFASSERT(ref, link->ll_ref == ref);
REFASSERT(ref, lu_ref_link_eq(link, scope, source));
- list_del(&link->ll_linkage);
+
cfs_
list_del(&link->ll_linkage);
ref->lf_refs--;
ref->lf_refs--;
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
OBD_SLAB_FREE(link, lu_ref_link_kmem, sizeof(*link));
} else {
OBD_SLAB_FREE(link, lu_ref_link_kmem, sizeof(*link));
} else {
- spin_lock(&ref->lf_guard);
+
cfs_
spin_lock(&ref->lf_guard);
REFASSERT(ref, ref->lf_failed > 0);
ref->lf_failed--;
REFASSERT(ref, ref->lf_failed > 0);
ref->lf_failed--;
- spin_unlock(&ref->lf_guard);
+
cfs_
spin_unlock(&ref->lf_guard);
}
}
EXPORT_SYMBOL(lu_ref_del_at);
}
}
EXPORT_SYMBOL(lu_ref_del_at);
@@
-310,10
+310,10
@@
static void *lu_ref_seq_start(struct seq_file *seq, loff_t *pos)
{
struct lu_ref *ref = seq->private;
{
struct lu_ref *ref = seq->private;
- spin_lock(&lu_ref_refs_guard);
- if (list_empty(&ref->lf_linkage))
+
cfs_
spin_lock(&lu_ref_refs_guard);
+ if (
cfs_
list_empty(&ref->lf_linkage))
ref = NULL;
ref = NULL;
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
return ref;
}
return ref;
}
@@
-324,17
+324,17
@@
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(!list_empty(&ref->lf_linkage));
+ LASSERT(!
cfs_
list_empty(&ref->lf_linkage));
- spin_lock(&lu_ref_refs_guard);
- next = list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
+
cfs_
spin_lock(&lu_ref_refs_guard);
+ next =
cfs_
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)++;
- list_move(&ref->lf_linkage, &next->lf_linkage);
+
cfs_
list_move(&ref->lf_linkage, &next->lf_linkage);
}
}
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
return p;
}
return p;
}
@@
-349,16
+349,16
@@
static int lu_ref_seq_show(struct seq_file *seq, void *p)
struct lu_ref *ref = p;
struct lu_ref *next;
struct lu_ref *ref = p;
struct lu_ref *next;
- spin_lock(&lu_ref_refs_guard);
- next = list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
+
cfs_
spin_lock(&lu_ref_refs_guard);
+ next =
cfs_
list_entry(ref->lf_linkage.next, struct lu_ref, lf_linkage);
if ((&next->lf_linkage == &lu_ref_refs) || lu_ref_is_marker(next)) {
if ((&next->lf_linkage == &lu_ref_refs) || lu_ref_is_marker(next)) {
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
return 0;
}
/* print the entry */
return 0;
}
/* print the entry */
- spin_lock(&next->lf_guard);
+
cfs_
spin_lock(&next->lf_guard);
seq_printf(seq, "lu_ref: %p %d %d %s:%d\n",
next, next->lf_refs, next->lf_failed,
next->lf_func, next->lf_line);
seq_printf(seq, "lu_ref: %p %d %d %s:%d\n",
next, next->lf_refs, next->lf_failed,
next->lf_func, next->lf_line);
@@
-368,12
+368,12
@@
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;
- list_for_each_entry(link, &next->lf_list, ll_linkage)
+
cfs_
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);
}
- spin_unlock(&next->lf_guard);
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_unlock(&next->lf_guard);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
return 0;
}
return 0;
}
@@
-392,12
+392,12
@@
static int lu_ref_seq_open(struct inode *inode, struct file *file)
result = seq_open(file, &lu_ref_seq_ops);
if (result == 0) {
result = seq_open(file, &lu_ref_seq_ops);
if (result == 0) {
- spin_lock(&lu_ref_refs_guard);
- if (!list_empty(&marker->lf_linkage))
+
cfs_
spin_lock(&lu_ref_refs_guard);
+ if (!
cfs_
list_empty(&marker->lf_linkage))
result = -EAGAIN;
else
result = -EAGAIN;
else
- list_add(&marker->lf_linkage, &lu_ref_refs);
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
list_add(&marker->lf_linkage, &lu_ref_refs);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
if (result == 0) {
struct seq_file *f = file->private_data;
if (result == 0) {
struct seq_file *f = file->private_data;
@@
-414,9
+414,9
@@
static int lu_ref_seq_release(struct inode *inode, struct file *file)
{
struct lu_ref *ref = ((struct seq_file *)file->private_data)->private;
{
struct lu_ref *ref = ((struct seq_file *)file->private_data)->private;
- spin_lock(&lu_ref_refs_guard);
- list_del_init(&ref->lf_linkage);
- spin_unlock(&lu_ref_refs_guard);
+
cfs_
spin_lock(&lu_ref_refs_guard);
+
cfs_
list_del_init(&ref->lf_linkage);
+
cfs_
spin_unlock(&lu_ref_refs_guard);
return seq_release(inode, file);
}
return seq_release(inode, file);
}
@@
-439,7
+439,7
@@
int lu_ref_global_init(void)
"lu_ref tracking is enabled. Performance isn't.\n");
"lu_ref tracking is enabled. Performance isn't.\n");
- spin_lock_init(&lu_ref_refs_guard);
+
cfs_
spin_lock_init(&lu_ref_refs_guard);
result = lu_kmem_init(lu_ref_caches);
#if defined(__KERNEL__) && defined(LPROCFS)
result = lu_kmem_init(lu_ref_caches);
#if defined(__KERNEL__) && defined(LPROCFS)