LU-12142 clio: fix hang on urgent cached pages

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

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index 34fbc66..0a28de1 100644 (file)
--- a/lustre/lov/lov_page.c
+++ b/lustre/lov/lov_page.c
@@ -56,8 +56,8 @@ static int lov_comp_page_print(const struct lu_env *env,
        struct lov_page *lp = cl2lov_page(slice);
 
        return (*printer)(env, cookie,
-                         LUSTRE_LOV_NAME"-page@%p, comp index: %x, gen: %u\n",
-                         lp, lp->lps_index, lp->lps_layout_gen);
+                         LUSTRE_LOV_NAME"-page@%p, gen: %u\n",
+                         lp, lp->lps_layout_gen);
 }
 
 static const struct cl_page_operations lov_comp_page_ops = {
@@ -96,17 +96,16 @@ int lov_page_init_composite(const struct lu_env *env, struct cl_object *obj,
        rc = lov_stripe_offset(loo->lo_lsm, entry, offset, stripe, &suboff);
        LASSERT(rc == 0);
 
-       lpg->lps_index = lov_comp_index(entry, stripe);
+       page->cp_lov_index = lov_comp_index(entry, stripe);
        lpg->lps_layout_gen = loo->lo_lsm->lsm_layout_gen;
-       cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_comp_page_ops);
+       cl_page_slice_add(page, &lpg->lps_cl, obj, &lov_comp_page_ops);
 
-       sub = lov_sub_get(env, lio, lpg->lps_index);
+       sub = lov_sub_get(env, lio, page->cp_lov_index);
        if (IS_ERR(sub))
                RETURN(PTR_ERR(sub));
 
        subobj = lovsub2cl(r0->lo_sub[stripe]);
-       list_for_each_entry(o, &subobj->co_lu.lo_header->loh_layers,
-                           co_lu.lo_linkage) {
+       cl_object_for_each(o, subobj) {
                if (o->co_ops->coo_page_init) {
                        rc = o->co_ops->coo_page_init(sub->sub_env, o, page,
                                                      cl_index(subobj, suboff));
@@ -139,8 +138,8 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
 
        ENTRY;
 
-       lpg->lps_index = ~0;
-       cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_empty_page_ops);
+       page->cp_lov_index = ~0;
+       cl_page_slice_add(page, &lpg->lps_cl, obj, &lov_empty_page_ops);
        addr = kmap(page->cp_vmpage);
        memset(addr, 0, cl_page_size(obj));
        kunmap(page->cp_vmpage);
@@ -148,6 +147,13 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
        RETURN(0);
 }
 
+int lov_page_init_foreign(const struct lu_env *env, struct cl_object *obj,
+                       struct cl_page *page, pgoff_t index)
+{
+       CDEBUG(D_PAGE, DFID" has no data\n", PFID(lu_object_fid(&obj->co_lu)));
+       RETURN(-ENODATA);
+}
+
 bool lov_page_is_empty(const struct cl_page *page)
 {
        const struct cl_page_slice *slice = cl_page_at(page, &lov_device_type);