LU-12043 llite: extend readahead locks for striped file

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

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index cda05f6..0f86103 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -364,6 +364,17 @@ ll_read_ahead_pages(const struct lu_env *env, struct cl_io *io,
                                if (rc < 0)
                                        break;
 
+                               /* Do not shrink the ria_end at any case until
+                                * the minimum end of current read is covered.
+                                * And only shrink the ria_end if the matched
+                                * LDLM lock doesn't cover more. */
+                               if (page_idx > ra.cra_end ||
+                                   (ra.cra_contention &&
+                                    page_idx > ria->ria_end_min)) {
+                                       ria->ria_end = ra.cra_end;
+                                       break;
+                               }
+
                                CDEBUG(D_READA, "idx: %lu, ra: %lu, rpc: %lu\n",
                                       page_idx, ra.cra_end, ra.cra_rpc_size);
                                LASSERTF(ra.cra_end >= page_idx,
@@ -380,8 +391,6 @@ ll_read_ahead_pages(const struct lu_env *env, struct cl_io *io,
                                        ria->ria_end = end - 1;
                                if (ria->ria_end < ria->ria_end_min)
                                        ria->ria_end = ria->ria_end_min;
-                               if (ria->ria_end > ra.cra_end)
-                                       ria->ria_end = ra.cra_end;
                        }
                        if (page_idx > ria->ria_end)
                                break;