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 7ceabd5..d75af2f 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -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.
         */
@@ -251,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;
@@ -323,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)