X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_dev.c;h=86a6fbb935ec29c950ffabc61aa453d3ae3963d3;hb=3ec611d61138de3901944e4fdb50d8872fd472d5;hp=01cdd3c723b6c17a5d23dcf09a71c1de4ec3da13;hpb=bd87398d3b5793a8939731cf5b3f11086d64a8ed;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lov_dev.c b/lustre/lov/lov_dev.c
index 01cdd3c..86a6fbb 100644
--- a/lustre/lov/lov_dev.c
+++ b/lustre/lov/lov_dev.c
@@ -60,7 +60,7 @@ cfs_mem_cache_t *lovsub_req_kmem;
 cfs_mem_cache_t *lov_lock_link_kmem;
 
 /** Lock class of lov_device::ld_mutex. */
-struct lock_class_key cl_lov_device_mutex_class;
+cfs_lock_class_key_t cl_lov_device_mutex_class;
 
 struct lu_kmem_descr lov_caches[] = {
         {
@@ -167,7 +167,7 @@ static void lov_key_fini(const struct lu_context *ctx,
                          struct lu_context_key *key, void *data)
 {
         struct lov_thread_info *info = data;
-        LINVRNT(list_empty(&info->lti_closure.clc_list));
+        LINVRNT(cfs_list_empty(&info->lti_closure.clc_list));
         OBD_SLAB_FREE_PTR(info, lov_thread_kmem);
 }
 
@@ -387,7 +387,7 @@ static int lov_expand_targets(const struct lu_env *env, struct lov_device *dev)
 
                 OBD_ALLOC(newd, tgt_size * sz);
                 if (newd != NULL) {
-                        mutex_lock(&dev->ld_mutex);
+                        cfs_mutex_lock(&dev->ld_mutex);
                         if (sub_size > 0) {
                                 memcpy(newd, dev->ld_target, sub_size * sz);
                                 OBD_FREE(dev->ld_target, sub_size * sz);
@@ -398,7 +398,7 @@ static int lov_expand_targets(const struct lu_env *env, struct lov_device *dev)
                         if (dev->ld_emrg != NULL)
                                 lov_emerg_free(dev->ld_emrg, sub_size);
                         dev->ld_emrg = emerg;
-                        mutex_unlock(&dev->ld_mutex);
+                        cfs_mutex_unlock(&dev->ld_mutex);
                 } else {
                         lov_emerg_free(emerg, tgt_size);
                         result = -ENOMEM;
@@ -504,8 +504,8 @@ static struct lu_device *lov_device_alloc(const struct lu_env *env,
         d->ld_ops        = &lov_lu_ops;
         ld->ld_cl.cd_ops = &lov_cl_ops;
 
-        mutex_init(&ld->ld_mutex);
-        lockdep_set_class(&ld->ld_mutex, &cl_lov_device_mutex_class);
+        cfs_mutex_init(&ld->ld_mutex);
+        cfs_lockdep_set_class(&ld->ld_mutex, &cl_lov_device_mutex_class);
 
         /* setup the LOV OBD */
         obd = class_name2obd(lustre_cfg_string(cfg, 0));