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=22683 fix unbalanced cl_env hash.
[fs/lustre-release.git]
/
lustre
/
obdclass
/
md_local_object.c
diff --git
a/lustre/obdclass/md_local_object.c
b/lustre/obdclass/md_local_object.c
index
e12841e
..
1d459a7
100644
(file)
--- a/
lustre/obdclass/md_local_object.c
+++ b/
lustre/obdclass/md_local_object.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.
*/
/*
@@
-56,10
+56,10
@@
/** List head to hold list of objects to be created. */
/** List head to hold list of objects to be created. */
-static
struct list_head
llo_lobj_list;
+static
cfs_list_t
llo_lobj_list;
/** Lock to protect list manipulations */
/** Lock to protect list manipulations */
-static
struct mutex
llo_lock;
+static
cfs_mutex_t
llo_lock;
/**
* Structure used to maintain state of path parsing.
/**
* Structure used to maintain state of path parsing.
@@
-378,18
+378,18
@@
EXPORT_SYMBOL(llo_store_create);
void llo_local_obj_register(struct lu_local_obj_desc *llod)
{
void llo_local_obj_register(struct lu_local_obj_desc *llod)
{
- mutex_lock(&llo_lock);
- list_add_tail(&llod->llod_linkage, &llo_lobj_list);
- mutex_unlock(&llo_lock);
+
cfs_
mutex_lock(&llo_lock);
+
cfs_
list_add_tail(&llod->llod_linkage, &llo_lobj_list);
+
cfs_
mutex_unlock(&llo_lock);
}
EXPORT_SYMBOL(llo_local_obj_register);
void llo_local_obj_unregister(struct lu_local_obj_desc *llod)
{
}
EXPORT_SYMBOL(llo_local_obj_register);
void llo_local_obj_unregister(struct lu_local_obj_desc *llod)
{
- mutex_lock(&llo_lock);
- list_del(&llod->llod_linkage);
- mutex_unlock(&llo_lock);
+
cfs_
mutex_lock(&llo_lock);
+
cfs_
list_del(&llod->llod_linkage);
+
cfs_
mutex_unlock(&llo_lock);
}
EXPORT_SYMBOL(llo_local_obj_unregister);
}
EXPORT_SYMBOL(llo_local_obj_unregister);
@@
-410,9
+410,9
@@
int llo_local_objects_setup(const struct lu_env *env,
int rc = 0;
fid = &info->lti_cfid;
int rc = 0;
fid = &info->lti_cfid;
- mutex_lock(&llo_lock);
+
cfs_
mutex_lock(&llo_lock);
- list_for_each_entry(scan, &llo_lobj_list, llod_linkage) {
+
cfs_
list_for_each_entry(scan, &llo_lobj_list, llod_linkage) {
lu_local_obj_fid(fid, scan->llod_oid);
dir = "";
if (scan->llod_dir)
lu_local_obj_fid(fid, scan->llod_oid);
dir = "";
if (scan->llod_dir)
@@
-439,7
+439,7
@@
int llo_local_objects_setup(const struct lu_env *env,
}
out:
}
out:
- mutex_unlock(&llo_lock);
+
cfs_
mutex_unlock(&llo_lock);
return rc;
}
return rc;
}
@@
-450,7
+450,7
@@
int llo_global_init(void)
int result;
CFS_INIT_LIST_HEAD(&llo_lobj_list);
int result;
CFS_INIT_LIST_HEAD(&llo_lobj_list);
- mutex_init(&llo_lock);
+
cfs_
mutex_init(&llo_lock);
LU_CONTEXT_KEY_INIT(&llod_key);
result = lu_context_key_register(&llod_key);
LU_CONTEXT_KEY_INIT(&llod_key);
result = lu_context_key_register(&llod_key);
@@
-460,5
+460,5
@@
int llo_global_init(void)
void llo_global_fini(void)
{
lu_context_key_degister(&llod_key);
void llo_global_fini(void)
{
lu_context_key_degister(&llod_key);
- LASSERT(list_empty(&llo_lobj_list));
+ LASSERT(
cfs_
list_empty(&llo_lobj_list));
}
}