LU-4423 libcfs: Use swap() in cfs_hash_bd_order()

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

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index 6854932..c9240df 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,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, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -69,16 +65,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.
         */
@@ -90,7 +76,7 @@ struct vvp_io {
                         * Inode modification time that is checked across DLM
                         * lock request.
                         */
-                       time_t                   ft_mtime;
+                       time64_t                 ft_mtime;
                        struct vm_area_struct   *ft_vma;
                        /**
                         *  locked page returned from vvp_io
@@ -251,6 +237,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 +310,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)