LU-7117 osp: set ptlrpc_request::rq_allow_replay properly

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

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 31aff08..d75af2f 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -69,16 +69,6 @@ struct vvp_io {
         * I/O vector information to or from which read/write is going.
         */
        struct iov_iter *vui_iter;
-#ifndef HAVE_FILE_OPERATIONS_READ_WRITE_ITER
-       /**
-        * Total iov count for left IO.
-        */
-       unsigned long vui_tot_nrsegs;
-       /**
-        * Old length for iov that was truncated partially.
-        */
-       size_t vui_iov_olen;
-#endif /* !HAVE_FILE_OPERATIONS_READ_WRITE_ITER */
        /**
         * Total size for the left IO.
         */
@@ -147,7 +137,6 @@ extern struct lu_context_key vvp_thread_key;
 
 extern struct kmem_cache *vvp_lock_kmem;
 extern struct kmem_cache *vvp_object_kmem;
-extern struct kmem_cache *vvp_req_kmem;
 
 struct vvp_thread_info {
        struct cl_lock          vti_lock;
@@ -252,6 +241,7 @@ 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;
@@ -269,7 +259,6 @@ static inline pgoff_t vvp_index(struct vvp_page *vpg)
 
 struct vvp_device {
        struct cl_device    vdv_cl;
-       struct super_block *vdv_sb;
        struct cl_device   *vdv_next;
 };
 
@@ -277,10 +266,6 @@ struct vvp_lock {
        struct cl_lock_slice vlk_cl;
 };
 
-struct vvp_req {
-       struct cl_req_slice vrq_cl;
-};
-
 static inline struct lu_device *vvp2lu_dev(struct vvp_device *vdv)
 {
        return &vdv->vdv_cl.cd_lu_dev;
@@ -329,7 +314,7 @@ static inline struct vvp_lock *cl2vvp_lock(const struct cl_lock_slice *slice)
        do {                                                            \
                if (unlikely(!(expr))) {                                \
                        LU_OBJECT_DEBUG(D_ERROR, (env), &(clob)->co_lu, \
-                                       #expr "\n");                    \
+                                       #expr);                         \
                        LINVRNT(0);                                     \
                }                                                       \
        } while (0)
@@ -347,8 +332,6 @@ 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);
-int vvp_req_init(const struct lu_env *env, struct cl_device *dev,
-                struct cl_req *req);
 struct lu_object *vvp_object_alloc(const struct lu_env *env,
                                   const struct lu_object_header *hdr,
                                   struct lu_device *dev);