LU-13004 ptlrpc: simplify bd_vec access.

[fs/lustre-release.git] / lustre / osc / osc_page.c

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index eabe5fd..d0fd5e2 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -111,11 +111,6 @@ void osc_index2policy(union ldlm_policy_data *policy,
        policy->l_extent.end   = cl_offset(obj, end + 1) - 1;
 }
 
-static const char *osc_list(struct list_head *head)
-{
-       return list_empty(head) ? "-" : "+";
-}
-
 static inline s64 osc_submit_duration(struct osc_page *opg)
 {
        if (ktime_to_ns(opg->ops_submit_time) == 0)
@@ -125,52 +120,51 @@ static inline s64 osc_submit_duration(struct osc_page *opg)
 }
 
 static int osc_page_print(const struct lu_env *env,
-                          const struct cl_page_slice *slice,
-                          void *cookie, lu_printer_t printer)
+                         const struct cl_page_slice *slice,
+                         void *cookie, lu_printer_t printer)
 {
-        struct osc_page       *opg = cl2osc_page(slice);
-        struct osc_async_page *oap = &opg->ops_oap;
-        struct osc_object     *obj = cl2osc(slice->cpl_obj);
-        struct client_obd     *cli = &osc_export(obj)->exp_obd->u.cli;
+       struct osc_page *opg = cl2osc_page(slice);
+       struct osc_async_page *oap = &opg->ops_oap;
+       struct osc_object *obj = cl2osc(slice->cpl_obj);
+       struct client_obd *cli = &osc_export(obj)->exp_obd->u.cli;
 
        return (*printer)(env, cookie, LUSTRE_OSC_NAME"-page@%p %lu: "
-                         "1< %#x %d %u %s %s > "
+                         "1< %#x %d %c %c > "
                          "2< %lld %u %u %#x %#x | %p %p %p > "
                          "3< %d %lld %d > "
-                         "4< %d %d %d %lu %s | %s %s %s %s > "
-                         "5< %s %s %s %s | %d %s | %d %s %s>\n",
+                         "4< %d %d %d %lu %c | %c %c %c %c > "
+                         "5< %c %c %c %c | %d %c | %d %c %c>\n",
                          opg, osc_index(opg),
-                          /* 1 */
-                          oap->oap_magic, oap->oap_cmd,
-                          oap->oap_interrupted,
-                          osc_list(&oap->oap_pending_item),
-                          osc_list(&oap->oap_rpc_item),
-                          /* 2 */
-                          oap->oap_obj_off, oap->oap_page_off, oap->oap_count,
-                          oap->oap_async_flags, oap->oap_brw_flags,
+                         /* 1 */
+                         oap->oap_magic, oap->oap_cmd,
+                         list_empty_marker(&oap->oap_pending_item),
+                         list_empty_marker(&oap->oap_rpc_item),
+                         /* 2 */
+                         oap->oap_obj_off, oap->oap_page_off, oap->oap_count,
+                         oap->oap_async_flags, oap->oap_brw_flags,
                          oap->oap_request, oap->oap_cli, obj,
                          /* 3 */
                          opg->ops_transfer_pinned,
                          osc_submit_duration(opg), opg->ops_srvlock,
-                          /* 4 */
-                          cli->cl_r_in_flight, cli->cl_w_in_flight,
-                          cli->cl_max_rpcs_in_flight,
-                          cli->cl_avail_grant,
-                          osc_list(&cli->cl_cache_waiters),
-                          osc_list(&cli->cl_loi_ready_list),
-                          osc_list(&cli->cl_loi_hp_ready_list),
-                          osc_list(&cli->cl_loi_write_list),
-                          osc_list(&cli->cl_loi_read_list),
-                          /* 5 */
-                         osc_list(&obj->oo_ready_item),
-                         osc_list(&obj->oo_hp_ready_item),
-                         osc_list(&obj->oo_write_item),
-                         osc_list(&obj->oo_read_item),
+                         /* 4 */
+                         cli->cl_r_in_flight, cli->cl_w_in_flight,
+                         cli->cl_max_rpcs_in_flight,
+                         cli->cl_avail_grant,
+                         list_empty_marker(&cli->cl_cache_waiters),
+                         list_empty_marker(&cli->cl_loi_ready_list),
+                         list_empty_marker(&cli->cl_loi_hp_ready_list),
+                         list_empty_marker(&cli->cl_loi_write_list),
+                         list_empty_marker(&cli->cl_loi_read_list),
+                         /* 5 */
+                         list_empty_marker(&obj->oo_ready_item),
+                         list_empty_marker(&obj->oo_hp_ready_item),
+                         list_empty_marker(&obj->oo_write_item),
+                         list_empty_marker(&obj->oo_read_item),
                          atomic_read(&obj->oo_nr_reads),
-                         osc_list(&obj->oo_reading_exts),
+                         list_empty_marker(&obj->oo_reading_exts),
                          atomic_read(&obj->oo_nr_writes),
-                         osc_list(&obj->oo_hp_exts),
-                         osc_list(&obj->oo_urgent_exts));
+                         list_empty_marker(&obj->oo_hp_exts),
+                         list_empty_marker(&obj->oo_urgent_exts));
 }
 
 static void osc_page_delete(const struct lu_env *env,
@@ -226,21 +220,6 @@ static void osc_page_clip(const struct lu_env *env,
        spin_unlock(&oap->oap_lock);
 }
 
-static int osc_page_cancel(const struct lu_env *env,
-                          const struct cl_page_slice *slice)
-{
-       struct osc_page *opg = cl2osc_page(slice);
-       int rc = 0;
-
-       /* Check if the transferring against this page
-        * is completed, or not even queued. */
-       if (opg->ops_transfer_pinned)
-               /* FIXME: may not be interrupted.. */
-               rc = osc_cancel_async_page(env, opg);
-       LASSERT(ergo(rc == 0, opg->ops_transfer_pinned == 0));
-       return rc;
-}
-
 static int osc_page_flush(const struct lu_env *env,
                          const struct cl_page_slice *slice,
                          struct cl_io *io)
@@ -265,7 +244,6 @@ static const struct cl_page_operations osc_page_ops = {
        .cpo_print         = osc_page_print,
        .cpo_delete        = osc_page_delete,
        .cpo_clip           = osc_page_clip,
-       .cpo_cancel         = osc_page_cancel,
        .cpo_flush          = osc_page_flush,
        .cpo_page_touch    = osc_page_touch,
 };
@@ -907,7 +885,6 @@ static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
        int i;
 
        if (desc != NULL) {
-               LASSERT(ptlrpc_is_bulk_desc_kiov(desc->bd_type));
                page_count = desc->bd_iov_count;
        } else {
                page_count = aa->aa_page_count;
@@ -916,7 +893,7 @@ static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
        for (i = 0; i < page_count; i++) {
                void *pz;
                if (desc)
-                       pz = page_zone(BD_GET_KIOV(desc, i).kiov_page);
+                       pz = page_zone(desc->bd_vec[i].kiov_page);
                else
                        pz = page_zone(aa->aa_ppga[i]->pg);