X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flov_page.c;h=2b9d54a0a949a0b1f8b85c51b5dedd2806d79335;hp=cea48a154b9d039517068f971406d9b7a5a662e8;hb=8d6d2914cf85be0508805cd5195163e1959652f4;hpb=05b9da4fd124c61fd41d4b560773c0552a1ee5d7 diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c index cea48a1..2b9d54a 100644 --- 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,11 +96,11 @@ 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); - 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)); @@ -139,7 +139,7 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj, ENTRY; - lpg->lps_index = ~0; + page->cp_lov_index = ~0; cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_empty_page_ops); addr = kmap(page->cp_vmpage); memset(addr, 0, cl_page_size(obj));