X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fcl_internal.h;h=0c1276deb37bc953b991a7e67bcea5933c2616df;hb=697dcf4e87f2dbebe57f3ccb9c0b0962b89cf1b4;hp=b17ec42b8ed778238928a2a5ac7199cad7611afb;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/cl_internal.h b/lustre/obdclass/cl_internal.h
index b17ec42..0c1276d 100644
--- a/lustre/obdclass/cl_internal.h
+++ b/lustre/obdclass/cl_internal.h
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,82 +36,18 @@
 #ifndef _CL_INTERNAL_H
 #define _CL_INTERNAL_H
 
-#define CLT_PVEC_SIZE (14)
-
-/**
- * Possible levels of the nesting. Currently this is 2: there are "top"
- * entities (files, extent locks), and "sub" entities (stripes and stripe
- * locks). This is used only for debugging counters right now.
- */
-enum clt_nesting_level {
-        CNL_TOP,
-        CNL_SUB,
-        CNL_NR
-};
-
-/**
- * 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 {
-        /*
-         * Common fields.
-         */
-        struct cl_io         clt_io;
-        struct cl_2queue     clt_queue;
-
-        /*
-         * Fields used by cl_lock.c
-         */
-        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 */
-
-        /*
-         * Fields used by cl_page.c
-         */
-        struct cl_page      *clt_pvec[CLT_PVEC_SIZE];
-
-        /*
-         * Fields used by cl_io.c
-         */
-        /**
-         * Pointer to the topmost ongoing IO in this thread.
-         */
-        struct cl_io        *clt_current_io;
-        /**
-         * Used for submitting a sync io.
-         */
-        struct cl_sync_io    clt_anchor;
-        /**
-         * Fields used by cl_lock_page_out().
-         */
-        pgoff_t              clt_next_index;
-        pgoff_t              clt_fn_index; /* first non-overlapped index */
+	/**
+	 * Used for submitting a sync I/O.
+	 */
+	struct cl_sync_io clt_anchor;
 };
 
 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 */