LU-11132 compile: fix LC_BI_BDEV for old kernels

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

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index ae74d25..ce0dba0 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, comp index: %x, gen: %u\n",
+                         lp, lp->lps_index, lp->lps_layout_gen);
 }
 
 static const struct cl_page_operations lov_comp_page_ops = {
@@ -80,8 +82,8 @@ int lov_page_init_composite(const struct lu_env *env, struct cl_object *obj,
        ENTRY;
 
        offset = cl_offset(obj, index);
-       entry = lov_lsm_entry(loo->lo_lsm, offset);
-       if (entry < 0) {
+       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);
                RETURN(0);
@@ -94,6 +96,7 @@ int lov_page_init_composite(const struct lu_env *env, struct cl_object *obj,
        LASSERT(rc == 0);
 
        lpg->lps_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);
@@ -134,6 +137,7 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
        void *addr;
        ENTRY;
 
+       lpg->lps_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 +146,14 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
        RETURN(0);
 }
 
+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 */