X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fost%2Fost_internal.h;h=d07b8ea4aeb8106bc8f8d06cb22505264b8d7845;hb=286f68d3859293b52917e74cb0dcc488c5649852;hp=a557e7074431af60ff9cb7e13047ec64133d3bdd;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/ost/ost_internal.h b/lustre/ost/ost_internal.h
index a557e70..d07b8ea 100644
--- a/lustre/ost/ost_internal.h
+++ b/lustre/ost/ost_internal.h
@@ -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.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,13 +37,13 @@
 #ifndef OST_INTERNAL_H
 #define OST_INTERNAL_H
 
-#define OSS_SERVICE_WATCHDOG_FACTOR 2000
+#define OSS_SERVICE_WATCHDOG_FACTOR 2
 
 /*
  * tunables for per-thread page pool (bug 5137)
  */
 #define OST_THREAD_POOL_SIZE PTLRPC_MAX_BRW_PAGES  /* pool size in pages */
-#define OST_THREAD_POOL_GFP  CFS_ALLOC_HIGHUSER    /* GFP mask for pool pages */
+#define OST_THREAD_POOL_GFP  GFP_HIGHUSER    /* GFP mask for pool pages */
 
 struct page;
 struct niobuf_local;
@@ -56,21 +56,14 @@ struct ptlrpc_request;
  */
 struct ost_thread_local_cache {
         /*
-         * pool of pages and nio buffers used by write-path
+         * pool of nio buffers used by write-path
          */
-        struct page          *page  [OST_THREAD_POOL_SIZE];
-        struct niobuf_local   local [OST_THREAD_POOL_SIZE];
-        struct niobuf_remote  remote[OST_THREAD_POOL_SIZE];
+        struct niobuf_local   local[OST_THREAD_POOL_SIZE];
+        unsigned int          temporary:1;
 };
 
 struct ost_thread_local_cache *ost_tls(struct ptlrpc_request *r);
 
-#define OSS_MIN_CREATE_THREADS  2UL
-#define OSS_MAX_CREATE_THREADS 16UL
-
-/* Quota stuff */
-extern quota_interface_t *quota_interface;
-
 #ifdef LPROCFS
 void lprocfs_ost_init_vars(struct lprocfs_static_vars *lvars);
 #else