LU-5039 mdd: do orphan cleanup asynchronously

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

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index 75ded96..77cae6f 100644 (file)
--- a/lustre/lov/lov_page.c
+++ b/lustre/lov/lov_page.c
@@ -70,7 +70,9 @@ static int lov_raid0_page_is_under_lock(const struct lu_env *env,
        unsigned int pps; /* pages per stripe */
        ENTRY;
 
-       CDEBUG(D_READA, "*max_index = %lu, nr = %d\n", index, r0->lo_nr);
+       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);
 
@@ -85,7 +87,13 @@ static int lov_raid0_page_is_under_lock(const struct lu_env *env,
 
        /* calculate the end of current stripe */
        pps = loo->lo_lsm->lsm_stripe_size >> PAGE_CACHE_SHIFT;
-       index = ((slice->cpl_index + pps) & ~(pps - 1)) - 1;
+       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);
@@ -129,6 +137,7 @@ int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,
                               &suboff);
        LASSERT(rc == 0);
 
+       lpg->lps_stripe = stripe;
        cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_raid0_page_ops);
 
        sub = lov_sub_get(env, lio, stripe);
@@ -136,8 +145,8 @@ int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,
                RETURN(PTR_ERR(sub));
 
        subobj = lovsub2cl(r0->lo_sub[stripe]);
-       cfs_list_for_each_entry(o, &subobj->co_lu.lo_header->loh_layers,
-                               co_lu.lo_linkage) {
+       list_for_each_entry(o, &subobj->co_lu.lo_header->loh_layers,
+                           co_lu.lo_linkage) {
                if (o->co_ops->coo_page_init != NULL) {
                        rc = o->co_ops->coo_page_init(sub->sub_env, o, page,
                                                      cl_index(subobj, suboff));