LU-12518 llite: proper names/types for offset/pages

[fs/lustre-release.git] / lustre / llite / vvp_io.c

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index f0ce954..97366bb 100644 (file)
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -768,17 +768,17 @@ static void vvp_io_setattr_fini(const struct lu_env *env,
 static int vvp_io_read_start(const struct lu_env *env,
                             const struct cl_io_slice *ios)
 {
-       struct vvp_io           *vio   = cl2vvp_io(env, ios);
-       struct cl_io            *io    = ios->cis_io;
-       struct cl_object        *obj   = io->ci_obj;
-       struct inode            *inode = vvp_object_inode(obj);
-       struct ll_inode_info    *lli   = ll_i2info(inode);
-       struct file             *file  = vio->vui_fd->fd_file;
-       loff_t  pos = io->u.ci_rd.rd.crw_pos;
-       long    cnt = io->u.ci_rd.rd.crw_count;
-       long    tot = vio->vui_tot_count;
-       int     exceed = 0;
-       int     result;
+       struct vvp_io *vio = cl2vvp_io(env, ios);
+       struct cl_io *io = ios->cis_io;
+       struct cl_object *obj = io->ci_obj;
+       struct inode *inode = vvp_object_inode(obj);
+       struct ll_inode_info *lli = ll_i2info(inode);
+       struct file *file = vio->vui_fd->fd_file;
+       loff_t pos = io->u.ci_rd.rd.crw_pos;
+       size_t cnt = io->u.ci_rd.rd.crw_count;
+       size_t tot = vio->vui_tot_count;
+       int exceed = 0;
+       int result;
        ENTRY;
 
        CLOBINVRNT(env, obj, vvp_object_invariant(obj));
@@ -816,15 +816,15 @@ static int vvp_io_read_start(const struct lu_env *env,
        /* initialize read-ahead window once per syscall */
        if (!vio->vui_ra_valid) {
                vio->vui_ra_valid = true;
-               vio->vui_ra_start = cl_index(obj, pos);
-               vio->vui_ra_count = cl_index(obj, tot + PAGE_SIZE - 1);
+               vio->vui_ra_start_idx = cl_index(obj, pos);
+               vio->vui_ra_pages = cl_index(obj, tot + PAGE_SIZE - 1);
                /* If both start and end are unaligned, we read one more page
                 * than the index math suggests. */
-               if (pos % PAGE_SIZE != 0 && (pos + tot) % PAGE_SIZE != 0)
-                       vio->vui_ra_count++;
+               if ((pos & ~PAGE_MASK) != 0 && ((pos + tot) & ~PAGE_MASK) != 0)
+                       vio->vui_ra_pages++;
 
-               CDEBUG(D_READA, "tot %ld, ra_start %lu, ra_count %lu\n", tot,
-                      vio->vui_ra_start, vio->vui_ra_count);
+               CDEBUG(D_READA, "tot %zu, ra_start %lu, ra_count %lu\n",
+                      tot, vio->vui_ra_start_idx, vio->vui_ra_pages);
        }
 
        /* BUG: 5972 */
@@ -1545,7 +1545,7 @@ static int vvp_io_read_ahead(const struct lu_env *env,
                struct vvp_io *vio = cl2vvp_io(env, ios);
 
                if (unlikely(vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED)) {
-                       ra->cra_end = CL_PAGE_EOF;
+                       ra->cra_end_idx = CL_PAGE_EOF;
                        result = +1; /* no need to call down */
                }
        }