LU-15811 llite: Unify range unlock

[fs/lustre-release.git] / lustre / llite / vvp_internal.h

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 6fbffa2..76085ce 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * Internal definitions for VVP layer.
  *
@@ -189,12 +188,6 @@ struct vvp_object {
        struct inode           *vob_inode;
 
        /**
-        * Number of transient pages.  This is no longer protected by i_sem,
-        * and needs to be atomic.  This is not actually used for anything,
-        * and can probably be removed.
-        */
-       atomic_t                vob_transient_pages;
-       /**
         * Number of outstanding mmaps on this file.
         *
         * \see ll_vm_open(), ll_vm_close().
@@ -219,9 +212,6 @@ struct vvp_object {
  */
 struct vvp_page {
        struct cl_page_slice vpg_cl;
-       unsigned        vpg_defer_uptodate:1,
-                       vpg_ra_updated:1,
-                       vpg_ra_used:1;
        /** VM page */
        struct page     *vpg_page;
 };
@@ -307,7 +297,8 @@ struct lu_object *vvp_object_alloc(const struct lu_env *env,
 int vvp_global_init(void);
 void vvp_global_fini(void);
 
-#ifndef HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT
+#if !defined(HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT) || \
+defined(HAVE_KALLSYMS_LOOKUP_NAME)
 extern unsigned int (*vvp_account_page_dirtied)(struct page *page,
                                                struct address_space *mapping);
 #endif