LU-1346 libcfs: replace cfs_ memory wrappers

[fs/lustre-release.git] / lustre / obdclass / cl_lock.c

diff --git a/lustre/obdclass/cl_lock.c b/lustre/obdclass/cl_lock.c
index fde2be4..21a5306 100644 (file)
--- a/lustre/obdclass/cl_lock.c
+++ b/lustre/obdclass/cl_lock.c
@@ -49,7 +49,7 @@
 
 /** Lock class of cl_lock::cll_guard */
 static struct lock_class_key cl_lock_guard_class;
-static cfs_mem_cache_t *cl_lock_kmem;
+static struct kmem_cache *cl_lock_kmem;
 
 static struct lu_kmem_descr cl_lock_caches[] = {
         {
@@ -384,7 +384,7 @@ static struct cl_lock *cl_lock_alloc(const struct lu_env *env,
         struct lu_object_header *head;
 
         ENTRY;
-        OBD_SLAB_ALLOC_PTR_GFP(lock, cl_lock_kmem, CFS_ALLOC_IO);
+       OBD_SLAB_ALLOC_PTR_GFP(lock, cl_lock_kmem, __GFP_IO);
         if (lock != NULL) {
                 cfs_atomic_set(&lock->cll_ref, 1);
                 lock->cll_descr = *descr;