LU-13086 tests: restore compatibility with mpich

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

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index 2b9d54a..37f3d79 100644 (file)
--- a/lustre/lov/lov_page.c
+++ b/lustre/lov/lov_page.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * Implementation of cl_page for LOV layer.
  *
@@ -98,15 +97,14 @@ int lov_page_init_composite(const struct lu_env *env, struct cl_object *obj,
 
        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, 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));
@@ -140,7 +138,7 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
        ENTRY;
 
        page->cp_lov_index = ~0;
-       cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_empty_page_ops);
+       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);