LU-6142 llite: use %pd to report dentry names.

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

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 128e5ac..ce123d3 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -71,11 +71,6 @@ struct vvp_io {
 
        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
@@ -93,6 +88,7 @@ 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;
@@ -119,10 +115,10 @@ struct vvp_io {
        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;
@@ -249,7 +245,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 {
@@ -323,6 +319,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 */