LU-12535 lov: Move page index to top level

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

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index 19a908f..2b9d54a 100644 (file)
--- a/lustre/lov/lov_page.c
+++ b/lustre/lov/lov_page.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -55,7 +55,9 @@ 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, raid0\n", lp);
+       return (*printer)(env, cookie,
+                         LUSTRE_LOV_NAME"-page@%p, gen: %u\n",
+                         lp, lp->lps_layout_gen);
 }
 
 static const struct cl_page_operations lov_comp_page_ops = {
@@ -66,21 +68,22 @@ int lov_page_init_composite(const struct lu_env *env, struct cl_object *obj,
                            struct cl_page *page, pgoff_t index)
 {
        struct lov_object *loo = cl2lov(obj);
-       struct lov_io     *lio = lov_env_io(env);
-       struct cl_object  *subobj;
-       struct cl_object  *o;
+       struct lov_io *lio = lov_env_io(env);
+       struct cl_object *subobj;
+       struct cl_object *o;
        struct lov_io_sub *sub;
-       struct lov_page   *lpg = cl_object_page_slice(obj, page);
+       struct lov_page *lpg = cl_object_page_slice(obj, page);
        struct lov_layout_raid0 *r0;
-       loff_t             offset;
-       loff_t             suboff;
-       int                entry;
-       int                stripe;
-       int                rc;
+       loff_t offset;
+       loff_t suboff;
+       int entry;
+       int stripe;
+       int rc;
+
        ENTRY;
 
        offset = cl_offset(obj, index);
-       entry = lov_lsm_entry(loo->lo_lsm, offset);
+       entry = lov_io_layout_at(lio, offset);
        if (entry < 0 || !lsm_entry_inited(loo->lo_lsm, entry)) {
                /* non-existing layout component */
                lov_page_init_empty(env, obj, page, index);
@@ -93,17 +96,18 @@ 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));
 
        subobj = lovsub2cl(r0->lo_sub[stripe]);
        list_for_each_entry(o, &subobj->co_lu.lo_header->loh_layers,
                            co_lu.lo_linkage) {
-               if (o->co_ops->coo_page_init != NULL) {
+               if (o->co_ops->coo_page_init) {
                        rc = o->co_ops->coo_page_init(sub->sub_env, o, page,
                                                      cl_index(subobj, suboff));
                        if (rc != 0)
@@ -118,9 +122,9 @@ static int lov_empty_page_print(const struct lu_env *env,
                                const struct cl_page_slice *slice,
                                void *cookie, lu_printer_t printer)
 {
-        struct lov_page *lp = cl2lov_page(slice);
+       struct lov_page *lp = cl2lov_page(slice);
 
-        return (*printer)(env, cookie, LUSTRE_LOV_NAME"-page@%p, empty.\n", lp);
+       return (*printer)(env, cookie, LUSTRE_LOV_NAME"-page@%p, empty.\n", lp);
 }
 
 static const struct cl_page_operations lov_empty_page_ops = {
@@ -132,8 +136,10 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
 {
        struct lov_page *lpg = cl_object_page_slice(obj, page);
        void *addr;
+
        ENTRY;
 
+       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));
@@ -142,6 +148,21 @@ 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);
+
+       LASSERT(slice != NULL);
+       return slice->cpl_ops == &lov_empty_page_ops;
+}
+
 
 /** @} lov */