LU-13799 llite: Remove transient page counting

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

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 11839b2..fa4f512 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.
  */
@@ -60,16 +52,17 @@ struct vvp_io {
        /** super class */
        struct cl_io_slice     vui_cl;
        struct cl_io_lock_link vui_link;
-       /** Total size for the left IO. */
+       /**
+        * I/O vector information to or from which read/write is going.
+        */
+       struct iov_iter *vui_iter;
+       /**
+        * Total size for the left IO.
+        */
        size_t vui_tot_count;
 
        union {
                struct vvp_fault_io {
-                       /**
-                        * Inode modification time that is checked across DLM
-                        * lock request.
-                        */
-                       time64_t                 ft_mtime;
                        struct vm_area_struct   *ft_vma;
                        /**
                         *  locked page returned from vvp_io
@@ -87,21 +80,17 @@ struct vvp_io {
                         * check that flags are from filemap_fault
                         */
                        bool                     ft_flags_valid;
+                       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
         */
@@ -110,12 +99,13 @@ struct vvp_io {
        * File descriptor against which IO is done.
        */
        struct ll_file_data     *vui_fd;
+       struct kiocb            *vui_iocb;
 
        /* Readahead state. */
-       pgoff_t vui_ra_start;
-       pgoff_t vui_ra_count;
+       pgoff_t                 vui_ra_start_idx;
+       pgoff_t                 vui_ra_pages;
        /* Set when vui_ra_{start,count} have been initialized. */
-       bool            vui_ra_valid;
+       bool                    vui_ra_valid;
 };
 
 extern struct lu_device_type vvp_device_type;
@@ -198,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().
@@ -242,7 +226,7 @@ static inline struct vvp_page *cl2vvp_page(const struct cl_page_slice *slice)
 
 static inline pgoff_t vvp_index(struct vvp_page *vpg)
 {
-       return vpg->vpg_cl.cpl_index;
+       return vpg->vpg_page->index;
 }
 
 struct vvp_device {
@@ -257,22 +241,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)
@@ -316,6 +300,11 @@ 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
+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 */