X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_dev.c;h=c06a5deb339b7284bd8a8fd5b0331a0c9bec8754;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=228b1578d8730aa33622db5cb76060b86146f783;hpb=fbf5870b9848929d352460f1f005b79c0b5ccc5a;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_dev.c b/lustre/osc/osc_dev.c
index 228b157..c06a5de 100644
--- a/lustre/osc/osc_dev.c
+++ b/lustre/osc/osc_dev.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,29 +15,25 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * 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.
+ *
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * Implementation of cl_device, cl_req for OSC layer.
+ * Implementation of cl_device, for OSC layer.
  *
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
  */
 
-/** \addtogroup osc osc @{ */
-
 #define DEBUG_SUBSYSTEM S_OSC
 
 /* class_name2obd() */
@@ -47,20 +41,19 @@
 
 #include "osc_cl_internal.h"
 
-cfs_mem_cache_t *osc_page_kmem;
-cfs_mem_cache_t *osc_lock_kmem;
-cfs_mem_cache_t *osc_object_kmem;
-cfs_mem_cache_t *osc_thread_kmem;
-cfs_mem_cache_t *osc_session_kmem;
-cfs_mem_cache_t *osc_req_kmem;
+/** \addtogroup osc 
+ * @{ 
+ */
+
+struct kmem_cache *osc_lock_kmem;
+struct kmem_cache *osc_object_kmem;
+struct kmem_cache *osc_thread_kmem;
+struct kmem_cache *osc_session_kmem;
+struct kmem_cache *osc_extent_kmem;
+struct kmem_cache *osc_quota_kmem;
 
 struct lu_kmem_descr osc_caches[] = {
         {
-                .ckd_cache = &osc_page_kmem,
-                .ckd_name  = "osc_page_kmem",
-                .ckd_size  = sizeof (struct osc_page)
-        },
-        {
                 .ckd_cache = &osc_lock_kmem,
                 .ckd_name  = "osc_lock_kmem",
                 .ckd_size  = sizeof (struct osc_lock)
@@ -81,17 +74,20 @@ struct lu_kmem_descr osc_caches[] = {
                 .ckd_size  = sizeof (struct osc_session)
         },
         {
-                .ckd_cache = &osc_req_kmem,
-                .ckd_name  = "osc_req_kmem",
-                .ckd_size  = sizeof (struct osc_req)
-        },
-        {
+		.ckd_cache = &osc_extent_kmem,
+		.ckd_name  = "osc_extent_kmem",
+		.ckd_size  = sizeof (struct osc_extent)
+	},
+	{
+		.ckd_cache = &osc_quota_kmem,
+		.ckd_name  = "osc_quota_kmem",
+		.ckd_size  = sizeof(struct osc_quota_info)
+	},
+	{
                 .ckd_cache = NULL
         }
 };
 
-struct lock_class_key osc_ast_guard_class;
-
 /*****************************************************************************
  *
  * Type conversions.
@@ -110,21 +106,23 @@ static struct lu_device *osc2lu_dev(struct osc_device *osc)
  */
 
 static void *osc_key_init(const struct lu_context *ctx,
-                         struct lu_context_key *key)
+			  struct lu_context_key *key)
 {
-        struct osc_thread_info *info;
+	struct osc_thread_info *info;
 
-        OBD_SLAB_ALLOC_PTR(info, osc_thread_kmem);
-        if (info == NULL)
-                info = ERR_PTR(-ENOMEM);
-        return info;
+	OBD_SLAB_ALLOC_PTR_GFP(info, osc_thread_kmem, GFP_NOFS);
+	if (info == NULL)
+		info = ERR_PTR(-ENOMEM);
+	return info;
 }
 
 static void osc_key_fini(const struct lu_context *ctx,
                          struct lu_context_key *key, void *data)
 {
-        struct osc_thread_info *info = data;
-        OBD_SLAB_FREE_PTR(info, osc_thread_kmem);
+	struct osc_thread_info *info = data;
+
+	lu_buf_free(&info->oti_ladvise_buf);
+	OBD_SLAB_FREE_PTR(info, osc_thread_kmem);
 }
 
 struct lu_context_key osc_key = {
@@ -134,14 +132,14 @@ struct lu_context_key osc_key = {
 };
 
 static void *osc_session_init(const struct lu_context *ctx,
-                              struct lu_context_key *key)
+			      struct lu_context_key *key)
 {
-        struct osc_session *info;
+	struct osc_session *info;
 
-        OBD_SLAB_ALLOC_PTR(info, osc_session_kmem);
-        if (info == NULL)
-                info = ERR_PTR(-ENOMEM);
-        return info;
+	OBD_SLAB_ALLOC_PTR_GFP(info, osc_session_kmem, GFP_NOFS);
+	if (info == NULL)
+		info = ERR_PTR(-ENOMEM);
+	return info;
 }
 
 static void osc_session_fini(const struct lu_context *ctx,
@@ -173,10 +171,6 @@ static const struct lu_device_operations osc_lu_ops = {
         .ldo_recovery_complete = NULL
 };
 
-static const struct cl_device_operations osc_cl_ops = {
-        .cdo_req_init = osc_req_init
-};
-
 static int osc_device_init(const struct lu_env *env, struct lu_device *d,
                            const char *name, struct lu_device *next)
 {
@@ -186,7 +180,7 @@ static int osc_device_init(const struct lu_env *env, struct lu_device *d,
 static struct lu_device *osc_device_fini(const struct lu_env *env,
                                          struct lu_device *d)
 {
-        return 0;
+	return NULL;
 }
 
 static struct lu_device *osc_device_free(const struct lu_env *env,
@@ -215,7 +209,6 @@ static struct lu_device *osc_device_alloc(const struct lu_env *env,
         cl_device_init(&od->od_cl, t);
         d = osc2lu_dev(od);
         d->ld_ops = &osc_lu_ops;
-        od->od_cl.cd_ops = &osc_cl_ops;
 
         /* Setup OSC OBD */
         obd = class_name2obd(lustre_cfg_string(cfg, 0));