LU-3435 util: Improvement to error logging for l_getidentity

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 6fde94e..20e3c59 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -49,7 +49,7 @@
 #include "ofd_internal.h"
 
 /* Slab for OFD object allocation */
-static cfs_mem_cache_t *ofd_object_kmem;
+static struct kmem_cache *ofd_object_kmem;
 
 static struct lu_kmem_descr ofd_caches[] = {
        {
@@ -313,7 +313,7 @@ static struct lu_object *ofd_object_alloc(const struct lu_env *env,
 
        ENTRY;
 
-       OBD_SLAB_ALLOC_PTR_GFP(of, ofd_object_kmem, CFS_ALLOC_IO);
+       OBD_SLAB_ALLOC_PTR_GFP(of, ofd_object_kmem, __GFP_IO);
        if (of != NULL) {
                struct lu_object        *o;
                struct lu_object_header *h;
@@ -553,7 +553,7 @@ int ofd_fid_init(const struct lu_env *env, struct ofd_device *ofd)
 
        OBD_ALLOC_PTR(ss->ss_client_seq);
        if (ss->ss_client_seq == NULL)
-               GOTO(out_free, -ENOMEM);
+               GOTO(out_free, rc = -ENOMEM);
 
        snprintf(name, strlen(obd_name) + 6, "%p-super", obd_name);
        rc = seq_client_init(ss->ss_client_seq, NULL, LUSTRE_SEQ_DATA,