LU-2800 build: fix compilation issue with is_compat_task

[fs/lustre-release.git] / lustre / osp / osp_dev.c

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index af6ef02..52ad482 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,9 +42,6 @@
  * Author: Di Wang <di.wang@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <obd_class.h>
@@ -55,7 +52,7 @@
 #include "osp_internal.h"
 
 /* Slab for OSP object allocation */
-cfs_mem_cache_t *osp_object_kmem;
+struct kmem_cache *osp_object_kmem;
 
 static struct lu_kmem_descr osp_caches[] = {
        {
@@ -76,7 +73,7 @@ struct lu_object *osp_object_alloc(const struct lu_env *env,
        struct osp_object       *o;
        struct lu_object        *l;
 
-       OBD_SLAB_ALLOC_PTR_GFP(o, osp_object_kmem, CFS_ALLOC_IO);
+       OBD_SLAB_ALLOC_PTR_GFP(o, osp_object_kmem, __GFP_IO);
        if (o != NULL) {
                l = &o->opo_obj.do_lu;
 
@@ -665,7 +662,7 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
 
                OBD_ALLOC(cli->cl_rpc_lock, sizeof(*cli->cl_rpc_lock));
                if (!cli->cl_rpc_lock)
-                       RETURN(-ENOMEM);
+                       GOTO(out_fini, rc = -ENOMEM);
                osp_init_rpc_lock(cli->cl_rpc_lock);
        }