X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_dev.c;h=281ea61ba3ea966136a729eb9b9765f89f46e64c;hb=9c71dacaf0b16c10952b4d788016e70b667cd77b;hp=a0216e352493b4879d6264e0aefde396190e08cb;hpb=e768e65ce59b6294813b538f308049ae2cbe74a0;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_dev.c b/lustre/osc/osc_dev.c
index a0216e3..281ea61 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.
@@ -55,6 +53,7 @@ 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;
+cfs_mem_cache_t *osc_extent_kmem;
 
 struct lu_kmem_descr osc_caches[] = {
         {
@@ -88,6 +87,11 @@ struct lu_kmem_descr osc_caches[] = {
                 .ckd_size  = sizeof (struct osc_req)
         },
         {
+		.ckd_cache = &osc_extent_kmem,
+		.ckd_name  = "osc_extent_kmem",
+		.ckd_size  = sizeof (struct osc_extent)
+	},
+	{
                 .ckd_cache = NULL
         }
 };
@@ -182,9 +186,6 @@ static const struct cl_device_operations osc_cl_ops = {
 static int osc_device_init(const struct lu_env *env, struct lu_device *d,
                            const char *name, struct lu_device *next)
 {
-        struct osc_device *od = lu2osc_dev(d);
-
-        od->od_lockless_truncate = 1;
         RETURN(0);
 }