LU-13731 autoconf: check if VM_FAULT_RETRY is defined

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

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 645b4b5..363a0f3 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, 2016, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,7 +37,6 @@
 #ifndef VVP_INTERNAL_H
 #define VVP_INTERNAL_H
 
-#include <lustre/lustre_idl.h>
 #include <cl_object.h>
 
 enum obd_notify_event;
@@ -61,16 +60,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
@@ -88,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;
@@ -96,9 +97,10 @@ struct vvp_io {
                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;
@@ -111,12 +113,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;
@@ -124,7 +127,6 @@ extern struct lu_device_type vvp_device_type;
 extern struct lu_context_key vvp_session_key;
 extern struct lu_context_key vvp_thread_key;
 
-extern struct kmem_cache *vvp_lock_kmem;
 extern struct kmem_cache *vvp_object_kmem;
 
 struct vvp_thread_info {
@@ -132,6 +134,7 @@ struct vvp_thread_info {
        struct cl_lock_descr    vti_descr;
        struct cl_io            vti_io;
        struct cl_attr          vti_attr;
+       struct cl_sync_io       vti_anchor;
 };
 
 static inline struct vvp_thread_info *vvp_env_info(const struct lu_env *env)
@@ -243,7 +246,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 {
@@ -251,10 +254,6 @@ struct vvp_device {
        struct cl_device   *vdv_next;
 };
 
-struct vvp_lock {
-       struct cl_lock_slice vlk_cl;
-};
-
 static inline struct lu_device *vvp2lu_dev(struct vvp_device *vdv)
 {
        return &vdv->vdv_cl.cd_lu_dev;
@@ -262,22 +261,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)
@@ -293,11 +292,6 @@ static inline struct page *cl2vm_page(const struct cl_page_slice *slice)
        return cl2vvp_page(slice)->vpg_page;
 }
 
-static inline struct vvp_lock *cl2vvp_lock(const struct cl_lock_slice *slice)
-{
-       return container_of(slice, struct vvp_lock, vlk_cl);
-}
-
 #ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
 # define CLOBINVRNT(env, clob, expr)                                   \
        do {                                                            \
@@ -317,8 +311,6 @@ int lov_read_and_clear_async_rc(struct cl_object *clob);
 int vvp_io_init(const struct lu_env *env, struct cl_object *obj,
                struct cl_io *io);
 int vvp_io_write_commit(const struct lu_env *env, struct cl_io *io);
-int vvp_lock_init(const struct lu_env *env, struct cl_object *obj,
-                 struct cl_lock *lock, const struct cl_io *io);
 int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
                  struct cl_page *page, pgoff_t index);
 struct lu_object *vvp_object_alloc(const struct lu_env *env,
@@ -328,6 +320,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 */