LU-6943 clio: get rid of cl_req

[fs/lustre-release.git] / lustre / obdclass / cl_page.c

diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c
index 03ad075..315fe4c 100644 (file)
--- a/lustre/obdclass/cl_page.c
+++ b/lustre/obdclass/cl_page.c
@@ -137,7 +137,6 @@ static void cl_page_free(const struct lu_env *env, struct cl_page *page)
 
        PASSERT(env, page, list_empty(&page->cp_batch));
        PASSERT(env, page, page->cp_owner == NULL);
-       PASSERT(env, page, page->cp_req == NULL);
        PASSERT(env, page, page->cp_state == CPS_FREEING);
 
        ENTRY;
@@ -192,7 +191,6 @@ struct cl_page *cl_page_alloc(const struct lu_env *env,
                page->cp_type = type;
                INIT_LIST_HEAD(&page->cp_layers);
                INIT_LIST_HEAD(&page->cp_batch);
-               INIT_LIST_HEAD(&page->cp_flight);
                lu_ref_init(&page->cp_reference);
                head = o->co_lu.lo_header;
                list_for_each_entry(o, &head->loh_layers,
@@ -603,7 +601,6 @@ static int cl_page_own0(const struct lu_env *env, struct cl_io *io,
                                         io, nonblock);
                 if (result == 0) {
                         PASSERT(env, pg, pg->cp_owner == NULL);
-                        PASSERT(env, pg, pg->cp_req == NULL);
                        pg->cp_owner = cl_io_top(io);;
                         cl_page_owner_set(pg);
                         if (pg->cp_state != CPS_FREEING) {
@@ -915,8 +912,6 @@ void cl_page_completion(const struct lu_env *env,
         struct cl_sync_io *anchor = pg->cp_sync_io;
 
         PASSERT(env, pg, crt < CRT_NR);
-        /* cl_page::cp_req already cleared by the caller (osc_completion()) */
-        PASSERT(env, pg, pg->cp_req == NULL);
         PASSERT(env, pg, pg->cp_state == cl_req_type_state(crt));
 
         ENTRY;
@@ -927,20 +922,11 @@ void cl_page_completion(const struct lu_env *env,
         CL_PAGE_INVOID_REVERSE(env, pg, CL_PAGE_OP(io[crt].cpo_completion),
                                (const struct lu_env *,
                                 const struct cl_page_slice *, int), ioret);
-        if (anchor) {
-                LASSERT(pg->cp_sync_io == anchor);
-                pg->cp_sync_io = NULL;
-       }
-       /*
-        * As page->cp_obj is pinned by a reference from page->cp_req, it is
-        * safe to call cl_page_put() without risking object destruction in a
-        * non-blocking context.
-        */
-       cl_page_put(env, pg);
-
-       if (anchor != NULL)
+       if (anchor != NULL) {
+               LASSERT(pg->cp_sync_io == anchor);
+               pg->cp_sync_io = NULL;
                cl_sync_io_note(env, anchor, ioret);
-
+       }
        EXIT;
 }
 EXPORT_SYMBOL(cl_page_completion);
@@ -1026,10 +1012,10 @@ void cl_page_header_print(const struct lu_env *env, void *cookie,
                           lu_printer_t printer, const struct cl_page *pg)
 {
        (*printer)(env, cookie,
-                  "page@%p[%d %p %d %d %d %p %p]\n",
+                  "page@%p[%d %p %d %d %d %p]\n",
                   pg, atomic_read(&pg->cp_ref), pg->cp_obj,
                   pg->cp_state, pg->cp_error, pg->cp_type,
-                  pg->cp_owner, pg->cp_req);
+                  pg->cp_owner);
 }
 EXPORT_SYMBOL(cl_page_header_print);