Revert "LU-9019 osc: migrate to time64_t"

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

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 949d370..81d0c52 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -36,8 +36,9 @@
  */
 
 #define DEBUG_SUBSYSTEM S_OSC
+#include <lustre_osc.h>
 
-#include "osc_cl_internal.h"
+#include "osc_internal.h"
 
 static void osc_lru_del(struct client_obd *cli, struct osc_page *opg);
 static void osc_lru_use(struct client_obd *cli, struct osc_page *opg);
@@ -300,6 +301,7 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj,
 
        return result;
 }
+EXPORT_SYMBOL(osc_page_init);
 
 /**
  * Helper function called by osc_io_submit() for every page in an immediate
@@ -581,7 +583,7 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
        }
 
        pvec = (struct cl_page **)osc_env_info(env)->oti_pvec;
-       io = &osc_env_info(env)->oti_io;
+       io = osc_env_thread_io(env);
 
        spin_lock(&cli->cl_lru_list_lock);
        if (force)
@@ -683,6 +685,7 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
        }
        RETURN(count > 0 ? count : rc);
 }
+EXPORT_SYMBOL(osc_lru_shrink);
 
 /**
  * Reclaim LRU pages by an IO thread. The caller wants to reclaim at least
@@ -775,6 +778,7 @@ static int osc_lru_alloc(const struct lu_env *env, struct client_obd *cli,
        struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);
        struct osc_io *oio = osc_env_io(env);
        int rc = 0;
+
        ENTRY;
 
        if (cli->cl_cache == NULL) /* shall not be in LRU */
@@ -873,17 +877,27 @@ void osc_lru_unreserve(struct client_obd *cli, unsigned long npages)
  * are likely from the same page zone.
  */
 static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
+                                           struct osc_brw_async_args *aa,
                                            int factor)
 {
-       int page_count = desc->bd_iov_count;
+       int page_count;
        void *zone = NULL;
        int count = 0;
        int i;
 
-       LASSERT(ptlrpc_is_bulk_desc_kiov(desc->bd_type));
+       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;
+       }
 
        for (i = 0; i < page_count; i++) {
-               void *pz = page_zone(BD_GET_KIOV(desc, i).kiov_page);
+               void *pz;
+               if (desc)
+                       pz = page_zone(BD_GET_KIOV(desc, i).kiov_page);
+               else
+                       pz = page_zone(aa->aa_ppga[i]->pg);
 
                if (likely(pz == zone)) {
                        ++count;
@@ -902,14 +916,16 @@ static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
                mod_zone_page_state(zone, NR_UNSTABLE_NFS, factor * count);
 }
 
-static inline void add_unstable_page_accounting(struct ptlrpc_bulk_desc *desc)
+static inline void add_unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
+                                               struct osc_brw_async_args *aa)
 {
-       unstable_page_accounting(desc, 1);
+       unstable_page_accounting(desc, aa, 1);
 }
 
-static inline void dec_unstable_page_accounting(struct ptlrpc_bulk_desc *desc)
+static inline void dec_unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
+                                               struct osc_brw_async_args *aa)
 {
-       unstable_page_accounting(desc, -1);
+       unstable_page_accounting(desc, aa, -1);
 }
 
 /**
@@ -926,12 +942,19 @@ static inline void dec_unstable_page_accounting(struct ptlrpc_bulk_desc *desc)
 void osc_dec_unstable_pages(struct ptlrpc_request *req)
 {
        struct ptlrpc_bulk_desc *desc       = req->rq_bulk;
+       struct osc_brw_async_args *aa = (void *)&req->rq_async_args;
        struct client_obd       *cli        = &req->rq_import->imp_obd->u.cli;
-       int                      page_count = desc->bd_iov_count;
+       int                      page_count;
        long                     unstable_count;
 
+       if (desc)
+               page_count = desc->bd_iov_count;
+       else
+               page_count = aa->aa_page_count;
+
        LASSERT(page_count >= 0);
-       dec_unstable_page_accounting(desc);
+
+       dec_unstable_page_accounting(desc, aa);
 
        unstable_count = atomic_long_sub_return(page_count,
                                                &cli->cl_unstable_count);
@@ -953,14 +976,20 @@ void osc_dec_unstable_pages(struct ptlrpc_request *req)
 void osc_inc_unstable_pages(struct ptlrpc_request *req)
 {
        struct ptlrpc_bulk_desc *desc = req->rq_bulk;
+       struct osc_brw_async_args *aa = (void *)&req->rq_async_args;
        struct client_obd       *cli  = &req->rq_import->imp_obd->u.cli;
-       long                     page_count = desc->bd_iov_count;
+       long                     page_count;
 
        /* No unstable page tracking */
        if (cli->cl_cache == NULL || !cli->cl_cache->ccc_unstable_check)
                return;
 
-       add_unstable_page_accounting(desc);
+       if (desc)
+               page_count = desc->bd_iov_count;
+       else
+               page_count = aa->aa_page_count;
+
+       add_unstable_page_accounting(desc, aa);
        atomic_long_add(page_count, &cli->cl_unstable_count);
        atomic_long_add(page_count, &cli->cl_cache->ccc_unstable_nr);