X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fcl_page.c;h=4dfa0d6d50f30eeb615387720087617816fabcab;hp=9723b380980ba1e8a911eb8e38f58a12ae82bd20;hb=3ae81448da0009293063547f1f95e116f7102418;hpb=5fb29cd1e77ca7bee34791138b49f5dd50d5116b

diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c
index 9723b38..4dfa0d6 100644
--- a/lustre/obdclass/cl_page.c
+++ b/lustre/obdclass/cl_page.c
@@ -268,7 +268,7 @@ struct cl_page *cl_page_alloc(const struct lu_env *env, struct cl_object *o,
 			      enum cl_page_type type)
 {
 	struct cl_page *cl_page;
-	struct lu_object_header *head;
+	struct cl_object *head;
 
 	ENTRY;
 
@@ -290,11 +290,11 @@ struct cl_page *cl_page_alloc(const struct lu_env *env, struct cl_object *o,
 		cl_page->cp_vmpage = vmpage;
 		cl_page->cp_state = CPS_CACHED;
 		cl_page->cp_type = type;
+		cl_page->cp_inode = NULL;
 		INIT_LIST_HEAD(&cl_page->cp_batch);
 		lu_ref_init(&cl_page->cp_reference);
-		head = o->co_lu.lo_header;
-		list_for_each_entry(o, &head->loh_layers,
-				    co_lu.lo_linkage) {
+		head = o;
+		cl_object_for_each(o, head) {
 			if (o->co_ops->coo_page_init != NULL) {
 				result = o->co_ops->coo_page_init(env, o,
 							cl_page, ind);
@@ -350,7 +350,7 @@ struct cl_page *cl_page_find(const struct lu_env *env,
         if (type == CPT_CACHEABLE) {
 		/* vmpage lock is used to protect the child/parent
 		 * relationship */
-		KLASSERT(PageLocked(vmpage));
+		LASSERT(PageLocked(vmpage));
                 /*
                  * cl_vmpage_page() can be called here without any locks as
                  *
@@ -515,7 +515,7 @@ struct cl_page *cl_vmpage_page(struct page *vmpage, struct cl_object *obj)
 	struct cl_page *page;
 
 	ENTRY;
-	KLASSERT(PageLocked(vmpage));
+	LASSERT(PageLocked(vmpage));
 
 	/*
 	 * NOTE: absence of races and liveness of data are guaranteed by page