LU-6499 obdclass: obdclass module cleanup upon load error

[fs/lustre-release.git] / lustre / obdclass / cl_internal.h

diff --git a/lustre/obdclass/cl_internal.h b/lustre/obdclass/cl_internal.h
index b1c360b..361efb0 100644 (file)
--- a/lustre/obdclass/cl_internal.h
+++ b/lustre/obdclass/cl_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.
@@ -17,17 +15,15 @@
  *
  * 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 (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -54,25 +50,6 @@ enum clt_nesting_level {
 };
 
 /**
- * Counters used to check correctness of cl_lock interface usage.
- */
-struct cl_thread_counters {
-        /**
-         * Number of outstanding calls to cl_lock_mutex_get() made by the
-         * current thread. For debugging.
-         */
-        int           ctc_nr_locks_locked;
-        /** List of locked locks. */
-        struct lu_ref ctc_locks_locked;
-        /** Number of outstanding holds on locks. */
-        int           ctc_nr_held;
-        /** Number of outstanding uses on locks. */
-        int           ctc_nr_used;
-        /** Number of held extent locks. */
-        int           ctc_nr_locks_acquired;
-};
-
-/**
  * Thread local state internal for generic cl-code.
  */
 struct cl_thread_info {
@@ -87,10 +64,6 @@ struct cl_thread_info {
          */
         struct cl_lock_descr clt_descr;
         struct cl_page_list  clt_list;
-        /**
-         * Counters for every level of lock nesting.
-         */
-        struct cl_thread_counters clt_counters[CNL_NR];
         /** @} debugging */
 
         /*
@@ -110,12 +83,15 @@ struct cl_thread_info {
          */
         struct cl_sync_io    clt_anchor;
         /**
-         * Fields used by cl_lock_page_out().
+        * Fields used by cl_lock_discard_pages().
          */
         pgoff_t              clt_next_index;
         pgoff_t              clt_fn_index; /* first non-overlapped index */
 };
 
 struct cl_thread_info *cl_env_info(const struct lu_env *env);
+void cl_page_disown0(const struct lu_env *env,
+                    struct cl_io *io, struct cl_page *pg);
+
 
 #endif /* _CL_INTERNAL_H */