Revert "b=22965 enable lockless truncate"

[fs/lustre-release.git] / lustre / osc / osc_dev.c

diff --git a/lustre/osc/osc_dev.c b/lustre/osc/osc_dev.c
index 228b157..8148b7a 100644 (file)
--- a/lustre/osc/osc_dev.c
+++ b/lustre/osc/osc_dev.c
@@ -26,7 +26,7 @@
  * 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.
  */
 /*
@@ -38,8 +38,6 @@
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
  */
 
-/** \addtogroup osc osc @{ */
-
 #define DEBUG_SUBSYSTEM S_OSC
 
 /* class_name2obd() */
@@ -47,6 +45,10 @@
 
 #include "osc_cl_internal.h"
 
+/** \addtogroup osc 
+ * @{ 
+ */
+
 cfs_mem_cache_t *osc_page_kmem;
 cfs_mem_cache_t *osc_lock_kmem;
 cfs_mem_cache_t *osc_object_kmem;
@@ -90,7 +92,7 @@ struct lu_kmem_descr osc_caches[] = {
         }
 };
 
-struct lock_class_key osc_ast_guard_class;
+cfs_lock_class_key_t osc_ast_guard_class;
 
 /*****************************************************************************
  *
@@ -114,7 +116,7 @@ static void *osc_key_init(const struct lu_context *ctx,
 {
         struct osc_thread_info *info;
 
-        OBD_SLAB_ALLOC_PTR(info, osc_thread_kmem);
+        OBD_SLAB_ALLOC_PTR_GFP(info, osc_thread_kmem, CFS_ALLOC_IO);
         if (info == NULL)
                 info = ERR_PTR(-ENOMEM);
         return info;
@@ -138,7 +140,7 @@ static void *osc_session_init(const struct lu_context *ctx,
 {
         struct osc_session *info;
 
-        OBD_SLAB_ALLOC_PTR(info, osc_session_kmem);
+        OBD_SLAB_ALLOC_PTR_GFP(info, osc_session_kmem, CFS_ALLOC_IO);
         if (info == NULL)
                 info = ERR_PTR(-ENOMEM);
         return info;