LU-16579 llite: fix the wrong beyond read end calculation

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

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 49f1688..bad0150 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -1858,13 +1858,11 @@ int ll_readpage(struct file *file, struct page *vmpage)
        struct inode *inode = file_inode(file);
        struct cl_object *clob = ll_i2info(inode)->lli_clob;
        struct ll_sb_info *sbi = ll_i2sbi(inode);
-       const struct lu_env  *env = NULL;
+       const struct lu_env *env = NULL;
        struct cl_read_ahead ra = { 0 };
        struct ll_cl_context *lcc;
-       struct cl_io   *io = NULL;
-       struct iov_iter *iter;
+       struct cl_io *io = NULL;
        struct cl_page *page;
-       struct kiocb *iocb;
        int result;
        ENTRY;
 
@@ -1970,11 +1968,8 @@ int ll_readpage(struct file *file, struct page *vmpage)
        }
 
        if (lcc && lcc->lcc_type != LCC_MMAP) {
-               iocb = lcc->lcc_iocb;
-               iter = lcc->lcc_iter;
-
-               CDEBUG(D_VFSTRACE, "pgno:%ld, cnt:%ld, pos:%lld\n",
-                      vmpage->index, iter->count, iocb->ki_pos);
+               CDEBUG(D_VFSTRACE, "pgno:%ld, beyond read end_index:%ld\n",
+                      vmpage->index, lcc->lcc_end_index);
 
                /*
                 * This handles a kernel bug introduced in kernel 5.12:
@@ -2000,7 +1995,7 @@ int ll_readpage(struct file *file, struct page *vmpage)
                 * This should never occur except in kernels with the bug
                 * mentioned above.
                 */
-               if (cl_offset(clob, vmpage->index) >= iter->count + iocb->ki_pos) {
+               if (vmpage->index >= lcc->lcc_end_index) {
                        result = cl_io_read_ahead(env, io, vmpage->index, &ra);
                        if (result < 0 || vmpage->index > ra.cra_end_idx) {
                                cl_read_ahead_release(env, &ra);