LU-3259 clio: Revise read ahead implementation

[fs/lustre-release.git] / lustre / lov / lov_page.c

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index 121ad67..cbfc245 100644 (file)
--- a/lustre/lov/lov_page.c
+++ b/lustre/lov/lov_page.c
@@ -53,53 +53,6 @@
  *
  */
 
-/**
- * Adjust the stripe index by layout of raid0. @max_index is the maximum
- * page index covered by an underlying DLM lock.
- * This function converts max_index from stripe level to file level, and make
- * sure it's not beyond one stripe.
- */
-static int lov_raid0_page_is_under_lock(const struct lu_env *env,
-                                       const struct cl_page_slice *slice,
-                                       struct cl_io *unused,
-                                       pgoff_t *max_index)
-{
-       struct lov_object *loo = cl2lov(slice->cpl_obj);
-       struct lov_layout_raid0 *r0 = lov_r0(loo);
-       pgoff_t index = *max_index;
-       unsigned int pps; /* pages per stripe */
-       ENTRY;
-
-       CDEBUG(D_READA, DFID "*max_index = %lu, nr = %d\n",
-              PFID(lu_object_fid(lov2lu(loo))), index, r0->lo_nr);
-
-       if (index == 0) /* the page is not covered by any lock */
-               RETURN(0);
-
-       if (r0->lo_nr == 1) /* single stripe file */
-               RETURN(0);
-
-       /* max_index is stripe level, convert it into file level */
-       if (index != CL_PAGE_EOF) {
-               int stripeno = lov_page_stripe(slice->cpl_page);
-               *max_index = lov_stripe_pgoff(loo->lo_lsm, index, stripeno);
-       }
-
-       /* calculate the end of current stripe */
-       pps = loo->lo_lsm->lsm_stripe_size >> PAGE_CACHE_SHIFT;
-       index = slice->cpl_index + pps - slice->cpl_index % pps - 1;
-
-       CDEBUG(D_READA, DFID "*max_index = %lu, index = %lu, pps = %u, "
-              "stripe_size = %u, stripe no = %u, page index = %lu\n",
-              PFID(lu_object_fid(lov2lu(loo))), *max_index, index, pps,
-              loo->lo_lsm->lsm_stripe_size, lov_page_stripe(slice->cpl_page),
-              slice->cpl_index);
-
-       /* never exceed the end of the stripe */
-       *max_index = min_t(pgoff_t, *max_index, index);
-       RETURN(0);
-}
-
 static int lov_raid0_page_print(const struct lu_env *env,
                                const struct cl_page_slice *slice,
                                void *cookie, lu_printer_t printer)
@@ -110,7 +63,6 @@ static int lov_raid0_page_print(const struct lu_env *env,
 }
 
 static const struct cl_page_operations lov_raid0_page_ops = {
-       .cpo_is_under_lock = lov_raid0_page_is_under_lock,
        .cpo_print = lov_raid0_page_print
 };