LU-16962 build: parallel configure cleanup

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

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 5384e0e..40648c4 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.
  *
@@ -46,13 +45,6 @@ struct obd_device;
 struct obd_export;
 struct page;
 
-enum vvp_io_subtype {
-       /** normal IO */
-       IO_NORMAL,
-       /** io started from splice_{read|write} */
-       IO_SPLICE,
-};
-
 /**
  * IO state private to VVP layer.
  */
@@ -91,19 +83,14 @@ struct vvp_io {
                        struct cl_page_list      ft_queue;
                } fault;
                struct {
-                       struct pipe_inode_info  *vui_pipe;
-                       unsigned int             vui_flags;
-               } splice;
-               struct {
                        struct cl_page_list vui_queue;
                        unsigned long vui_written;
+                       unsigned long vui_read;
                        int vui_from;
                        int vui_to;
-               } write;
+               } readwrite; /* normal io */
        } u;
 
-       enum vvp_io_subtype     vui_io_subtype;
-
        /**
         * Layout version when this IO is initialized
         */
@@ -201,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().
@@ -227,26 +208,8 @@ struct vvp_object {
 };
 
 /**
- * VVP-private page state.
+ * There is no VVP-private page state.
  */
-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;
-};
-
-static inline struct vvp_page *cl2vvp_page(const struct cl_page_slice *slice)
-{
-       return container_of(slice, struct vvp_page, vpg_cl);
-}
-
-static inline pgoff_t vvp_index(struct vvp_page *vpg)
-{
-       return vpg->vpg_cl.cpl_index;
-}
 
 struct vvp_device {
        struct cl_device    vdv_cl;
@@ -260,22 +223,22 @@ static inline struct lu_device *vvp2lu_dev(struct vvp_device *vdv)
 
 static inline struct vvp_device *lu2vvp_dev(const struct lu_device *d)
 {
-       return container_of0(d, struct vvp_device, vdv_cl.cd_lu_dev);
+       return container_of_safe(d, struct vvp_device, vdv_cl.cd_lu_dev);
 }
 
 static inline struct vvp_device *cl2vvp_dev(const struct cl_device *d)
 {
-       return container_of0(d, struct vvp_device, vdv_cl);
+       return container_of_safe(d, struct vvp_device, vdv_cl);
 }
 
 static inline struct vvp_object *cl2vvp(const struct cl_object *obj)
 {
-       return container_of0(obj, struct vvp_object, vob_cl);
+       return container_of_safe(obj, struct vvp_object, vob_cl);
 }
 
 static inline struct vvp_object *lu2vvp(const struct lu_object *obj)
 {
-       return container_of0(obj, struct vvp_object, vob_cl.co_lu);
+       return container_of_safe(obj, struct vvp_object, vob_cl.co_lu);
 }
 
 static inline struct inode *vvp_object_inode(const struct cl_object *obj)
@@ -286,11 +249,6 @@ static inline struct inode *vvp_object_inode(const struct cl_object *obj)
 int vvp_object_invariant(const struct cl_object *obj);
 struct vvp_object *cl_inode2vvp(struct inode *inode);
 
-static inline struct page *cl2vm_page(const struct cl_page_slice *slice)
-{
-       return cl2vvp_page(slice)->vpg_page;
-}
-
 #ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
 # define CLOBINVRNT(env, clob, expr)                                   \
        do {                                                            \
@@ -319,6 +277,12 @@ struct lu_object *vvp_object_alloc(const struct lu_env *env,
 int vvp_global_init(void);
 void vvp_global_fini(void);
 
+#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
+
 extern const struct file_operations vvp_dump_pgcache_file_ops;
 
 #endif /* VVP_INTERNAL_H */